Skip to content

oraclejdk: do not strip regular files from install dir#4255

Closed
lostdj wants to merge 1 commit intoNixOS:masterfrom
lostdj:ltp/master/oraclejdkfix
Closed

oraclejdk: do not strip regular files from install dir#4255
lostdj wants to merge 1 commit intoNixOS:masterfrom
lostdj:ltp/master/oraclejdkfix

Conversation

@lostdj
Copy link
Contributor

@lostdj lostdj commented Sep 24, 2014

Otherwise it removes src.zip, while those additional readme and license files won't harm anyone.

Otherwise it removes src.zip, while those additional readme and license files won't harm anyone.
@lostdj lostdj force-pushed the ltp/master/oraclejdkfix branch from c17a6ba to a96fc01 Compare September 24, 2014 12:06
@edolstra
Copy link
Member

Nix packages should not pollute the top-level directory. That's why these files were removed. A better solution is to do what the openjdk Nix expression does, namely, put everything in $out/lib/openjdk (with some symlinks like $out/bin).

@lostdj
Copy link
Contributor Author

lostdj commented Sep 24, 2014

We can leave src.zip and remove everything else, how about that?

@Eternity-Yarr
Copy link
Contributor

oracle jdk without src.zip is like "enable expert mode" button :)

@edolstra
Copy link
Member

OpenJDK has src.zip:

$ nix-build '<nixpkgs>' -A openjdk
$ ll ./result/lib/openjdk/
total 22268                                                                                                                                                                                   
-r--r--r-- 1 root root     1503 Jan  1  1970 ASSEMBLY_EXCEPTION                                                                                                                               
dr-xr-xr-x 2 root root     4096 Jan  1  1970 bin                                                                                                                                              
dr-xr-xr-x 3 root root     4096 Jan  1  1970 jre                                                                                                                                              
dr-xr-xr-x 3 root root     4096 Jan  1  1970 lib                                                                                                                                              
-r--r--r-- 1 root root    19263 Jan  1  1970 LICENSE                                                                                                                                          
-r--r--r-- 1 root root       80 Jan  1  1970 release                                                                                                                                          
-r--r--r-- 1 root root 22578529 Jan  1  1970 src.zip                                                                                                                                          
-r--r--r-- 1 root root   172252 Jan  1  1970 THIRD_PARTY_README

The OracleJDK Nix expression should follow the same layout.

@Fuuzetsu Fuuzetsu added the 0.kind: enhancement Add something new or improve an existing system. label Sep 24, 2014
@nathan-gs
Copy link
Member

+1
I don't think this change will break things. Maybe take into account the changes in #4541

@Fuuzetsu
Copy link
Member

No response from author for a long time, please open a new PR if you're still interested in this.

@Fuuzetsu Fuuzetsu closed this May 26, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: enhancement Add something new or improve an existing system.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants