public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wafHook: Don't wrap python2

Browse Source
This commit is contained in:
Janne Heß 2020-12-10 10:23:19 +01:00
parent 5b8d5f23f8
commit cfc4f6347f
No known key found for this signature in database
GPG Key ID: 69165158F05265DF
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/release-notes/rl-2103.xml
View File

@ -287,6 +287,12 @@
This avoids that the password gets exposed in the nix store. This avoids that the password gets exposed in the nix store.
</para> </para>
</listitem> </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> </itemizedlist>
</section> </section>

3
pkgs/development/tools/build-managers/wafHook/default.nix
View File

@ -1,7 +1,6 @@
{ lib, stdenv, pkgs, python, makeSetupHook, waf }: { lib, stdenv, pkgs, makeSetupHook, waf }:
makeSetupHook { makeSetupHook {
deps = [ python ];
substitutions = { substitutions = {
inherit waf; inherit waf;
crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)