diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-10 11:59:14 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-10 13:32:13 -0400 |
| commit | 3cb745d5a69018829ac15f7d5a508135f6bda123 (patch) | |
| tree | b12220dc50d09a0dec9cd6a174a2032e0f28748c /pkgs/development/compilers/openjdk | |
| parent | f385e224e5962cc80026171249a230d7111cc9bf (diff) | |
| download | nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.gz nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.bz2 nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.lz nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.xz nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.zst nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.zip | |
stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth, it brings us one baby step closer to handling spaces in store paths. Also, I optimized handling of many transitive deps with read. Probably, not very beneficial, but nice to enforce the pkg-per-line structure. Doing so let me find much dubious code and fix it. Two misc notes: - `propagated-user-env-packages` also needed to be adjusted as sometimes it is copied to/from the propagated input files. - `local fd` should ensure that file descriptors aren't clobbered during recursion.
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 7ddf2c7ef5d3..da1332127eb3 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 |