diff options
| author | Janne Heß <janne@hess.ooo> | 2020-12-10 10:23:19 +0100 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2020-12-17 19:01:28 +0100 |
| commit | cfc4f6347f58f357dfd6b9dbb824cda934c15416 (patch) | |
| tree | 3fd776451dafda01a0aebaec3cd9479d493f6c92 | |
| parent | 5b8d5f23f87def951ede3282357cdb87233a377d (diff) | |
| download | nixpkgs-cfc4f6347f58f357dfd6b9dbb824cda934c15416.tar nixpkgs-cfc4f6347f58f357dfd6b9dbb824cda934c15416.tar.gz nixpkgs-cfc4f6347f58f357dfd6b9dbb824cda934c15416.tar.bz2 nixpkgs-cfc4f6347f58f357dfd6b9dbb824cda934c15416.tar.lz nixpkgs-cfc4f6347f58f357dfd6b9dbb824cda934c15416.tar.xz nixpkgs-cfc4f6347f58f357dfd6b9dbb824cda934c15416.tar.zst nixpkgs-cfc4f6347f58f357dfd6b9dbb824cda934c15416.zip | |
wafHook: Don't wrap python2
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2103.xml | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/wafHook/default.nix | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 2b0144a69c2..2cc96ea86a5 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -287,6 +287,12 @@ This avoids that the password gets exposed in the nix store. </para> </listitem> + <listitem> + <para> + The <literal>wafHook</literal> hook does not wrap Python anymore. + Packages depending on <literal>wafHook</literal> need to include any Python into their <literal>nativeBuildInputs</literal>. + </para> + </listitem> </itemizedlist> </section> diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 4184bd5fe8c..2131caede3c 100644 --- a/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, pkgs, python, makeSetupHook, waf }: +{ lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { - deps = [ python ]; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) |