diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 11:05:58 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 11:05:58 +0200 |
| commit | a13802b2c8568426a6d31ab08aaaf2965010a6ce (patch) | |
| tree | d3bbadb2a5cae436931440b754b96c3ced2771be /pkgs/development/compilers/openjdk | |
| parent | 15f6dcb668dcb6b4bfe33f47091273f978dcc0bf (diff) | |
| parent | 581637ba5a512e1179cdaf0108931fca32892b32 (diff) | |
| download | nixlib-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar nixlib-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.gz nixlib-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.bz2 nixlib-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.lz nixlib-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.xz nixlib-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.zst nixlib-a13802b2c8568426a6d31ab08aaaf2965010a6ce.zip | |
Merge remote-tracking branch 'origin/master' into gcc-6
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/7.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 6dcbb0a330f1..9ef7d26b2efe 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -190,7 +190,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index e157249fb2f3..8dbace8dda1f 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -202,7 +202,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support |