diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-25 18:48:47 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 09:07:55 -0400 |
| commit | f6f40e3fe5fbb9721624a218faea1b520f9ec200 (patch) | |
| tree | 43feea62b59aa9074b198f069b6efd8efd2b9048 /pkgs/development/compilers/openjdk-darwin | |
| parent | 34c0ba498c47808695229c6299c8ef66a0de9649 (diff) | |
| download | nixlib-f6f40e3fe5fbb9721624a218faea1b520f9ec200.tar nixlib-f6f40e3fe5fbb9721624a218faea1b520f9ec200.tar.gz nixlib-f6f40e3fe5fbb9721624a218faea1b520f9ec200.tar.bz2 nixlib-f6f40e3fe5fbb9721624a218faea1b520f9ec200.tar.lz nixlib-f6f40e3fe5fbb9721624a218faea1b520f9ec200.tar.xz nixlib-f6f40e3fe5fbb9721624a218faea1b520f9ec200.tar.zst nixlib-f6f40e3fe5fbb9721624a218faea1b520f9ec200.zip | |
stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do not read in the entire file, but just the first line.
Diffstat (limited to 'pkgs/development/compilers/openjdk-darwin')
| -rw-r--r-- | pkgs/development/compilers/openjdk-darwin/8.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk-darwin/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index 691829c7788a..6234b63208cd 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -33,7 +33,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 8ce0835fcb69..1e8f88beea66 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -23,7 +23,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib |