diff options
| author | Jacek Galowicz <jacek.galowicz@cyberus-technology.de> | 2021-12-09 12:27:29 +0100 |
|---|---|---|
| committer | Jacek Galowicz <jacek@galowicz.de> | 2021-12-09 11:32:29 +0000 |
| commit | e7c70ce5c8cfb139adcbec73ec518031bfc8f211 (patch) | |
| tree | bb43212db22297515e31b9b69d730cac2a048e25 /pkgs | |
| parent | 2bc7345064f5fc454282f044589e9f4b288257d4 (diff) | |
Inject gcc path into makewrapper script
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/test/make-binary-wrapper/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 6f3b3ef4ae12b..04f0059ae153e 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -1,9 +1,9 @@ { lib, coreutils, python3, gcc, writeText, writeScript, runCommand, makeBinaryWrapper }: let - env = { nativeBuildInputs = [ makeBinaryWrapper gcc ]; }; + env = { nativeBuildInputs = [ makeBinaryWrapper ]; }; envCheck = runCommand "envcheck" env '' - cc -o $out ${./envcheck.c} + ${gcc}/bin/cc -o $out ${./envcheck.c} ''; makeGoldenTest = testname: runCommand "test-wrapper_${testname}" env '' mkdir -p /tmp/foo diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e1dd457d8405..80e9275f98ed6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -608,7 +608,9 @@ in makeBinaryWrapper = makeSetupHook { deps = [ dieHook ]; - } ../build-support/setup-hooks/make-binary-wrapper.sh; + } (runCommand "make-binary-wrapper.sh" {} '' + substitute ${../build-support/setup-hooks/make-binary-wrapper.sh} $out --replace " cc " " ${gcc}/bin/cc " + ''); makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { |