diff options
| author | Jacek Galowicz <jacek@galowicz.de> | 2021-12-09 15:48:46 +0000 |
|---|---|---|
| committer | Tobias Bergkvist <tobias@bergkv.ist> | 2021-12-09 17:22:55 +0100 |
| commit | d5e028a441ddcac16b380436c98439b769e35355 (patch) | |
| tree | b09556a8fe5081dac4a07ecb4ae6b1269b13e7ff /pkgs/top-level | |
| parent | 87fcb7b79ec65c246caf65d05fda0c2048a73cb2 (diff) | |
make-binary-wrapper: Make CC substitution safer
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e9275f98ed6..1f291fd6c5b96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -606,11 +606,13 @@ in makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } ../build-support/setup-hooks/make-wrapper.sh; - makeBinaryWrapper = makeSetupHook { - deps = [ dieHook ]; - } (runCommand "make-binary-wrapper.sh" {} '' - substitute ${../build-support/setup-hooks/make-binary-wrapper.sh} $out --replace " cc " " ${gcc}/bin/cc " - ''); + makeBinaryWrapper = let + script = runCommand "make-binary-wrapper.sh" {} '' + substitute ${../build-support/setup-hooks/make-binary-wrapper.sh} $out \ + --replace " @CC@ " " ${gcc}/bin/cc " + ''; + in + makeSetupHook { deps = [ dieHook ]; } script; makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { |