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

jdkPath: Remove in favor of jdk.home

Browse Source
This commit is contained in:
William A. Kennington III 2015-01-01 15:39:06 -08:00
parent a3eb2465ef
commit 238f4d1652
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jdk, jdkPath, ant, wget, zip, unzip, cpio, file, libxslt { stdenv, fetchurl, jdk, ant, wget, zip, unzip, cpio, file, libxslt
, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, kerberos, attr , xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, kerberos, attr
, alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils , alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils
, cacert, setJavaClassPath , cacert, setJavaClassPath
@ -58,7 +58,7 @@ let
"--without-rhino" "--without-rhino"
"--with-pax=paxctl" "--with-pax=paxctl"
"--with-jdk-home=${jdkPath}" "--with-jdk-home=${jdk.home}"
]; ];
preConfigure = '' preConfigure = ''

13
pkgs/development/web/grails/default.nix
View File

@ -1,14 +1,13 @@
{ stdenv, fetchurl, unzip { stdenv, fetchurl, unzip
# If jdkPath is null, require JAVA_HOME in runtime environment, else store # If jdk is null, require JAVA_HOME in runtime environment, else store
# JAVA_HOME=${jdkPath} into grails. # JAVA_HOME=${jdk.home} into grails.
, jdkPath ? null , jdk ? null
, coreutils, ncurses, gnused, gnugrep # for purity , coreutils, ncurses, gnused, gnugrep # for purity
}: }:
let let
binpath = stdenv.lib.makeSearchPath "bin" binpath = stdenv.lib.makeSearchPath "bin"
([ coreutils ncurses gnused gnugrep ] ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
++ stdenv.lib.optional (jdkPath != null) jdkPath);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "grails-2.4.3"; name = "grails-2.4.3";
@ -29,9 +28,9 @@ stdenv.mkDerivation rec {
rm -f "$out"/bin/*.bat rm -f "$out"/bin/*.bat
# Improve purity # Improve purity
sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
'' + stdenv.lib.optionalString (jdkPath != null) '' '' + stdenv.lib.optionalString (jdk != null) ''
# Inject JDK path into grails # Inject JDK path into grails
sed -i -e '2iJAVA_HOME=${jdkPath}' "$out"/bin/grails sed -i -e '2iJAVA_HOME=${jdk.home}' "$out"/bin/grails
''; '';
preferLocalBuild = true; preferLocalBuild = true;

5
pkgs/top-level/all-packages.nix
View File

@ -1361,9 +1361,7 @@ let
grafx2 = callPackage ../applications/graphics/grafx2 {}; grafx2 = callPackage ../applications/graphics/grafx2 {};
grails = callPackage ../development/web/grails { grails = callPackage ../development/web/grails { jdk = null; };
jdkPath = jdk.home;
};
graphviz = callPackage ../tools/graphics/graphviz { }; graphviz = callPackage ../tools/graphics/graphviz { };
@ -3445,7 +3443,6 @@ let
icedtea7_jdk = callPackage ../development/compilers/icedtea rec { icedtea7_jdk = callPackage ../development/compilers/icedtea rec {
jdk = openjdk; jdk = openjdk;
jdkPath = openjdk.home;
giflib = giflib_5_0; giflib = giflib_5_0;
} // { outputs = [ "out" ]; }; } // { outputs = [ "out" ]; };