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

stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files

Browse Source 
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
This commit is contained in:
John Ericson
2017-07-25 18:48:47 -04:00
parent 34c0ba498c
commit f6f40e3fe5
14 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/openjdk/7.nix
View File

@@ -190,7 +190,7 @@ let
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $jre/nix-support
printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support

2
pkgs/development/compilers/openjdk/8.nix
View File

@@ -202,7 +202,7 @@ let
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $jre/nix-support
printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support