diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-23 18:10:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-23 18:10:57 +0200 |
| commit | 82ec893b680000b2a399f606b93c981565134409 (patch) | |
| tree | dd1a4f4ffb80029dd9e2b4f64fd4bfc7a1da3aa9 /pkgs/development/interpreters | |
| parent | 3f936c2fa56bc7fa2cbabb3373d90b6dda850a82 (diff) | |
| parent | 1b3bb6cde3e5837f2f07dfbc935019cf84dab553 (diff) | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
6 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index c8e15be2c014e..f30270fcc83fb 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_1_8; nativeBuildInputs = [ - gawk makeWrapper pkg-config ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 8214ca2adcda1..73fb564077a38 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -42,7 +42,6 @@ builder rec { nativeBuildInputs = [ makeWrapper - gawk pkg-config ]; buildInputs = [ diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 04c60e80e8fcf..31803d9c16655 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -40,7 +40,6 @@ builder rec { ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile; nativeBuildInputs = [ - gawk makeWrapper pkg-config ]; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index d0f5aa5573b63..380e983ab6f56 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -40,7 +40,6 @@ builder rec { ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile; nativeBuildInputs = [ - gawk makeWrapper pkg-config ]; diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index cc03774492516..89a95e9821975 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -11,6 +11,9 @@ setuptoolsBuildPhase() { if [ -n "$setupPyGlobalFlags" ]; then args+="$setupPyGlobalFlags" fi + if [ -n "$enableParallelBuilding" ]; then + setupPyBuildFlags+="--parallel $NIX_BUILD_CORES" + fi if [ -n "$setupPyBuildFlags" ]; then args+="build_ext $setupPyBuildFlags" fi diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 514930db359b0..b36662335abe2 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildEnv, makeWrapper +{ lib, stdenv, buildEnv, makeBinaryWrapper # manually pased , python @@ -27,7 +27,7 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; postBuild = '' if [ -L "$out/bin" ]; then |