From 5abaf61d0fa88efbb36da7139c9004f63006d345 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 22 Aug 2023 22:31:36 -0300 Subject: [PATCH] wafHook: assimilated under waf.passthru.hook --- pkgs/development/tools/build-managers/waf/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 58d3a7d86f42..de4022ed7d70 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, callPackage , ensureNewerSourcesForZipFilesHook , python3 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` @@ -59,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + inherit python3 extraTools; + hook = callPackage ./hook.nix { + waf = finalAttrs.finalPackage; + }; + }; + meta = { homepage = "https://waf.io"; description = "The meta build system"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dc5931441f5..fd38df39e180 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14765,7 +14765,7 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; waf = callPackage ../development/tools/build-managers/waf { }; - wafHook = callPackage ../development/tools/build-managers/waf/hook.nix { }; + wafHook = waf.hook; waf-tester = callPackage ../tools/security/waf-tester { };