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/build-support/cc-wrapper/default.nix | |
| 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/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 37d62891ecfc..676fbd006881 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -275,9 +275,9 @@ stdenv.mkDerivation { # Propagate the wrapped cc so that if you install the wrapper, # you get tools like gcov, the manpages, etc. as well (including # for binutils and Glibc). - printLines ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages - printLines ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs + echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' |