diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-01 15:39:06 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-07 14:55:41 -0800 |
| commit | 238f4d16525b3cbbdcb5104af0c999725b043a7d (patch) | |
| tree | 07930001671ea9dabad30de1b80d579add4d9e75 | |
| parent | a3eb2465ef86ea9e05ff19c502ef2f50748f7fc4 (diff) | |
| download | nixlib-238f4d16525b3cbbdcb5104af0c999725b043a7d.tar nixlib-238f4d16525b3cbbdcb5104af0c999725b043a7d.tar.gz nixlib-238f4d16525b3cbbdcb5104af0c999725b043a7d.tar.bz2 nixlib-238f4d16525b3cbbdcb5104af0c999725b043a7d.tar.lz nixlib-238f4d16525b3cbbdcb5104af0c999725b043a7d.tar.xz nixlib-238f4d16525b3cbbdcb5104af0c999725b043a7d.tar.zst nixlib-238f4d16525b3cbbdcb5104af0c999725b043a7d.zip | |
jdkPath: Remove in favor of jdk.home
| -rw-r--r-- | pkgs/development/compilers/icedtea/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/web/grails/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix index 5e947ef1b37c..87f42c9aa311 100644 --- a/pkgs/development/compilers/icedtea/default.nix +++ b/pkgs/development/compilers/icedtea/default.nix @@ -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 , alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils , cacert, setJavaClassPath @@ -58,7 +58,7 @@ let "--without-rhino" "--with-pax=paxctl" - "--with-jdk-home=${jdkPath}" + "--with-jdk-home=${jdk.home}" ]; preConfigure = '' diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index b1ff7064003d..357e77009c4d 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, unzip -# If jdkPath is null, require JAVA_HOME in runtime environment, else store -# JAVA_HOME=${jdkPath} into grails. -, jdkPath ? null +# If jdk is null, require JAVA_HOME in runtime environment, else store +# JAVA_HOME=${jdk.home} into grails. +, jdk ? null , coreutils, ncurses, gnused, gnugrep # for purity }: let binpath = stdenv.lib.makeSearchPath "bin" - ([ coreutils ncurses gnused gnugrep ] - ++ stdenv.lib.optional (jdkPath != null) jdkPath); + ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { name = "grails-2.4.3"; @@ -29,9 +28,9 @@ stdenv.mkDerivation rec { rm -f "$out"/bin/*.bat # Improve purity sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails - '' + stdenv.lib.optionalString (jdkPath != null) '' + '' + stdenv.lib.optionalString (jdk != null) '' # 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7c0669e4d28..9e2861a3822b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1361,9 +1361,7 @@ let grafx2 = callPackage ../applications/graphics/grafx2 {}; - grails = callPackage ../development/web/grails { - jdkPath = jdk.home; - }; + grails = callPackage ../development/web/grails { jdk = null; }; graphviz = callPackage ../tools/graphics/graphviz { }; @@ -3445,7 +3443,6 @@ let icedtea7_jdk = callPackage ../development/compilers/icedtea rec { jdk = openjdk; - jdkPath = openjdk.home; giflib = giflib_5_0; } // { outputs = [ "out" ]; }; |