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/build-support | |
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/build-support')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 6 | ||||
-rw-r--r-- | pkgs/build-support/gcc-wrapper-old/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/build-support/trivial-builders.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 1b52a0b8b123..09d1d4cd681a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation { # The dynamic linker is passed in `ldflagsBefore' to allow # explicit overrides of the dynamic linker by callers to gcc/ld # (the *last* value counts, so ours should come first). - printLines "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before + printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before '') + optionalString (libc != null) '' @@ -258,9 +258,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 + printWords ${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 + printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh index 4f141f6b8f21..22e32814927e 100644 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -211,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh # tools like gcov, the manpages, etc. as well (including for binutils # and Glibc). if test -z "$nativeTools"; then - printLines $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages + printWords $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 1ee1fe8298fd..16bd4e8e4054 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -84,7 +84,7 @@ rec { mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + lib.optionalString (deps != []) '' - printLines ${toString deps} > $out/nix-support/propagated-native-build-inputs + printWords ${toString deps} > $out/nix-support/propagated-native-build-inputs '' + lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); |