From f01ecbee50daf947b03c5921abd0bcca6d66d2fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Nov 2014 11:12:29 +0100 Subject: [PATCH] nixBuild: Respect the preHook/postHook of the caller --- pkgs/build-support/release/nix-build.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index cb83b9db498..6e0088adc3f 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -18,6 +18,8 @@ , prePhases ? [] , postPhases ? [] , buildInputs ? [] +, preHook ? "" +, postHook ? "" , ... } @ args: let @@ -90,6 +92,7 @@ stdenv.mkDerivation ( . ${./functions.sh} origSrc=$src src=$(findTarball $src) + ${postHook} ''; preHook = '' @@ -105,6 +108,8 @@ stdenv.mkDerivation ( shopt -s expand_aliases alias make="scan-build -o _clang_analyze_$name --html-title='Scan results for $name' make" fi + + ${preHook} ''; # Clean up after analysis