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

wafHook: Refactored wafHook to use callPackage (#64250)

Browse Source 
This is to enable custom wafHook with custom waf via the override
system.
This commit is contained in:
xbreak 2019-07-03 21:20:28 +02:00 committed by Dmitry Kalinkin
parent 6e2ed274e1
commit 98d9a74223
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/build-managers/wafHook/default.nix Normal file
View File

@ -0,0 +1,10 @@
{ lib, stdenv, pkgs, python, makeSetupHook, waf }:
makeSetupHook {
deps = [ python ];
substitutions = {
inherit waf;
crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
};
} ./setup-hook.sh

0
pkgs/development/tools/build-managers/waf/setup-hook.sh → pkgs/development/tools/build-managers/wafHook/setup-hook.sh
View File

9
pkgs/top-level/all-packages.nix
View File

@ -6770,14 +6770,7 @@ in
volumeicon = callPackage ../tools/audio/volumeicon { };
waf = callPackage ../development/tools/build-managers/waf { python = python3; };
wafHook = makeSetupHook {
deps = [ python ];
substitutions = {
inherit waf;
crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
};
} ../development/tools/build-managers/waf/setup-hook.sh;
wafHook = callPackage ../development/tools/build-managers/wafHook { };
wakelan = callPackage ../tools/networking/wakelan { };