diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-24 00:53:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-24 01:05:30 -0400 |
| commit | b087618ac06256cb3c06278e7eaba45841f4ea91 (patch) | |
| tree | aeb5d6123fa58ebd20ff0351fba5b285d14c20e6 /pkgs/development/compilers/openjdk | |
| parent | f4a8e6ab7f4e1c6d7499a1660fbd5c655ad0a805 (diff) | |
| download | nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.gz nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.bz2 nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.lz nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.xz nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.zst nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.zip | |
Revert "stdenv: Store one package per line in nix-support/propagated-*"
As @oxij points out in [1], this breakage is especially serious because it changes the contents of built environments without a corresonding change in their hashes. Also, the revert is easier than I thought. This reverts commit 3cb745d5a69018829ac15f7d5a508135f6bda123. [1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
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 9ef7d26b2efe..6dcbb0a330f1 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 - printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs + echo -n "${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 7c50872ebe59..7977881d5f6d 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 - printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs + echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support |