public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

java: Add home passthru

Browse Source
This commit is contained in:
William A. Kennington III 2015-01-01 15:18:03 -08:00
parent 9a7766e054
commit bbc4262514
4 changed files with 266 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/icedtea/default.nix
View File

@ -34,9 +34,7 @@ let
bundleFun = name: "--with-${name}-src-zip=" + builtins.getAttr name sources; bundleFun = name: "--with-${name}-src-zip=" + builtins.getAttr name sources;
bundleFlags = map bundleFun bundleNames; bundleFlags = map bundleFun bundleNames;
in icedtea = stdenv.mkDerivation (with srcInfo; {
with srcInfo; stdenv.mkDerivation {
name = pkgName; name = pkgName;
src = fetchurl { src = fetchurl {
@ -176,5 +174,9 @@ with srcInfo; stdenv.mkDerivation {
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
passthru = { inherit architecture; }; passthru = {
} inherit architecture;
home = "${icedtea}/lib/icedtea";
};
});
in icedtea

2
pkgs/development/compilers/openjdk-darwin/default.nix
View File

@ -31,7 +31,7 @@ let
EOF EOF
''; '';
passthru.jre = jdk; passthru = { jre = jdk; };
}; };
in jdk in jdk

12
pkgs/development/compilers/openjdk/default.nix
View File

@ -27,9 +27,7 @@ let
md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
}; };
in openjdk = stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "openjdk-7u${update}b${build}"; name = "openjdk-7u${update}b${build}";
src = fetchurl { src = fetchurl {
@ -177,5 +175,9 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
passthru = { inherit architecture; }; passthru = {
} inherit architecture;
home = "${openjdk}/lib/openjdk";
};
};
in openjdk

2
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -180,6 +180,8 @@ let result = stdenv.mkDerivation rec {
passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
passthru.home = result;
meta.license = stdenv.lib.licenses.unfree; meta.license = stdenv.lib.licenses.unfree;
}; in result }; in result