diff options
author | Artturin <Artturin@artturin.com> | 2022-05-14 04:13:49 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-05-25 16:03:14 +0300 |
commit | 1d44ac176ce6de74ac912a5b043e948a87a6d2f5 (patch) | |
tree | e24df105f8085abbe7e449d1f5e6058d864514c0 /pkgs/build-support | |
parent | 39a2f44695940e04dfdb107a1cdfcbc51daa9e50 (diff) |
treewide: add enableParallelBuilding's to bootstrap packages so hashes stay the same
when enableParallelBuildingByDefault is enabled verified with `nix-diff $(nix eval ".#gcc-unwrapped.drvPath") $(nix eval --expr 'with import ./. { config = { enableParallelBuildingByDefault = true; }; }; gcc-unwrapped.drvPath' --impure)`
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 1 | ||||
-rw-r--r-- | pkgs/build-support/expand-response-params/default.nix | 1 | ||||
-rw-r--r-- | pkgs/build-support/nuke-references/default.nix | 1 | ||||
-rw-r--r-- | pkgs/build-support/pkg-config-wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/trivial-builders.nix | 1 |
6 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 4c2a13da015ef..b5adae03df2db 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -128,6 +128,8 @@ stdenv.mkDerivation { dontBuild = true; dontConfigure = true; + enableParallelBuilding = true; + unpackPhase = '' src=$PWD ''; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ac6257220fd11..35d714f9b41e1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -162,6 +162,7 @@ stdenv.mkDerivation { dontBuild = true; dontConfigure = true; + enableParallelBuilding = true; unpackPhase = '' src=$PWD diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix index bc161d790225c..9371b77023626 100644 --- a/pkgs/build-support/expand-response-params/default.nix +++ b/pkgs/build-support/expand-response-params/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation { name = "expand-response-params"; src = ./expand-response-params.c; strictDeps = true; + enableParallelBuilding = true; # Work around "stdenv-darwin-boot-2 is not allowed to refer to path # /nix/store/...-expand-response-params.c" unpackPhase = '' diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index 639992c0b85aa..8dd9704aa4b4a 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -15,6 +15,7 @@ stdenvNoCC.mkDerivation { name = "nuke-references"; strictDeps = true; + enableParallelBuilding = true; dontUnpack = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 2184b87eb1aec..312d2fe02610a 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { pname = targetPrefix + pkg-config.pname + "-wrapper"; inherit (pkg-config) version; + enableParallelBuilding = true; + preferLocalBuild = true; shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 8e853888719c7..1e04c9b0e293d 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -71,6 +71,7 @@ rec { # TODO(@Artturin): enable strictDeps always }: buildCommand: stdenv.mkDerivation ({ + enableParallelBuilding = true; inherit buildCommand name; passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or []); |