b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

waf: fix cross-compiling by not overriding python in all-packages.nix (#141821)

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Artturi 2021-10-16 20:11:28 +03:00 committed by GitHub
parent 1ee326f74d
commit 2736cee9ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/tools/build-managers/waf/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook
{ lib, stdenv, fetchFromGitLab, python3, ensureNewerSourcesForZipFilesHook
# optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]`
, withTools ? null
}:
@ -17,7 +17,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-WGGyhvQdFYmC0NOA5VVqCRMF1fvfPcTI42x1nHvz0W0=";
};
buildInputs = [ python ensureNewerSourcesForZipFilesHook ];
nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ];
# waf bin has #!/usr/bin/env python
buildInputs = [ python3 ];
configurePhase = ''
python waf-light configure
@ -29,6 +32,8 @@ stdenv.mkDerivation rec {
install -D waf $out/bin/waf
'';
strictDeps = true;
meta = with lib; {
description = "Meta build system";
homepage = "https://waf.io";

2
pkgs/top-level/all-packages.nix
View file

@ -10561,7 +10561,7 @@ with pkgs;
volumeicon = callPackage ../tools/audio/volumeicon { };
waf = callPackage ../development/tools/build-managers/waf { python = python3; };
waf = callPackage ../development/tools/build-managers/waf { };
wafHook = callPackage ../development/tools/build-managers/wafHook { };
wagyu = callPackage ../tools/misc/wagyu {