diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-07 13:15:34 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-07 15:10:45 -0400 |
| commit | 8b0fce8cb1013837cd2108193653a1763cd68266 (patch) | |
| tree | 9a66438ae3790f203561d354f0c1457da86f39b0 /pkgs/build-support/cc-wrapper/default.nix | |
| parent | 2110c0bd3009279ceec291f07bfbf063cb5ba6a0 (diff) | |
| download | nixlib-8b0fce8cb1013837cd2108193653a1763cd68266.tar nixlib-8b0fce8cb1013837cd2108193653a1763cd68266.tar.gz nixlib-8b0fce8cb1013837cd2108193653a1763cd68266.tar.bz2 nixlib-8b0fce8cb1013837cd2108193653a1763cd68266.tar.lz nixlib-8b0fce8cb1013837cd2108193653a1763cd68266.tar.xz nixlib-8b0fce8cb1013837cd2108193653a1763cd68266.tar.zst nixlib-8b0fce8cb1013837cd2108193653a1763cd68266.zip | |
{bintools,cc}-wrapper: Factor out role accumulation logic
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 0ea9dd0cb9f4..1b1c82b9294f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -282,7 +282,7 @@ stdenv.mkDerivation { + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${./utils.sh} $out/nix-support/utils.sh + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash ## ## Extra custom steps @@ -293,7 +293,7 @@ stdenv.mkDerivation { inherit expand-response-params; - # for substitution in utils.sh + # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; meta = |