alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

jre: Set valid value for meta.outputsToInstall

Browse source 
Fixes #17866.
This commit is contained in:
Eelco Dolstra 2016-08-22 17:04:22 +02:00
parent 4a755682a3
commit 5db200e839
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View file

@ -4791,10 +4791,14 @@ in
openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8;
jdk7 = self.openjdk7 // { outputs = [ "out" ]; };
jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (self.openjdk7.jre // { outputs = [ "jre" ]; });
jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(self.openjdk7.jre // { outputs = [ "jre" ]; }));
jdk8 = self.openjdk8 // { outputs = [ "out" ]; };
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (self.openjdk8.jre // { outputs = [ "jre" ]; });
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
(self.openjdk8.jre // { outputs = [ "jre" ]; }));
jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8;
jre = if stdenv.isDarwin then self.jre7 else self.jre8;