diff options
| author | Domen Kožar <domen@dev.si> | 2017-07-14 11:55:41 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-07-14 11:55:41 +0200 |
| commit | 0eb4f6fd2547442d8c51f73d4fe11225951ee663 (patch) | |
| tree | 1bd0e57c822b27ecffd0270165e0e51be418566a /pkgs/development/compilers/zulu/default.nix | |
| parent | f93050e509ff9df866f5f53343fbd8967ac8144d (diff) | |
| parent | a889454869e4f7d5ba6067ebcc0ba7fcd26e4417 (diff) | |
| download | nixpkgs-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar nixpkgs-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.gz nixpkgs-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.bz2 nixpkgs-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.lz nixpkgs-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.xz nixpkgs-0eb4f6fd2547442d8c51f73d4fe11225951ee663.tar.zst nixpkgs-0eb4f6fd2547442d8c51f73d4fe11225951ee663.zip | |
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
Merge staging. It includes fixes for cc-wrapper parsing speed and some other minor things. http://hydra.nixos.org/eval/1375094
Diffstat (limited to 'pkgs/development/compilers/zulu/default.nix')
| -rw-r--r-- | pkgs/development/compilers/zulu/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index c4cdf70f14a..03be4ee8a0b 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <<EOF >> $out/nix-support/setup-hook |