From cfc4f6347f58f357dfd6b9dbb824cda934c15416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 10:23:19 +0100 Subject: wafHook: Don't wrap python2 --- nixos/doc/manual/release-notes/rl-2103.xml | 6 ++++++ 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 2b0144a69c22..2cc96ea86a57 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. + + + The wafHook hook does not wrap Python anymore. + Packages depending on wafHook need to include any Python into their nativeBuildInputs. + + diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 4184bd5fe8cd..2131caede3c8 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) -- cgit v1.2.3