From 98d9a742231db5e81b20f7eeec7f31de3218627b Mon Sep 17 00:00:00 2001 From: xbreak Date: Wed, 3 Jul 2019 21:20:28 +0200 Subject: [PATCH] wafHook: Refactored wafHook to use callPackage (#64250) This is to enable custom wafHook with custom waf via the override system. --- .../tools/build-managers/wafHook/default.nix | 10 ++++++++++ .../build-managers/{waf => wafHook}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 9 +-------- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/tools/build-managers/wafHook/default.nix rename pkgs/development/tools/build-managers/{waf => wafHook}/setup-hook.sh (100%) diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix new file mode 100644 index 00000000000..4184bd5fe8c --- /dev/null +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -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 diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/waf/setup-hook.sh rename to pkgs/development/tools/build-managers/wafHook/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a1835850ad..91660f6b8eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };