From 2c024d28a219f3283d8adb10049162bd45332eb8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Apr 2016 05:00:18 +0200 Subject: [PATCH] cmst: Fix running of {pre,post}Configure Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of cmst override the whole configurePhase, so this hook isn't run at all. I've also added running the preBuild and postBuild hooks for the sake of completeness so that it's easier to override the derivation attributes. This fixes the build of cmst and it now successfully compiles on my machine. Signed-off-by: aszlig --- pkgs/tools/networking/cmst/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 24010e20f37..5c8b801dbbe 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase makeWrapper ]; configurePhase = '' + runHook preConfigure substituteInPlace ./cmst.pro \ --replace "/usr/bin" "$out/bin" \ --replace "/usr/share" "$out/usr/share" @@ -28,11 +29,14 @@ stdenv.mkDerivation rec { substituteInPlace ./apps/rootapp/rootapp.pro \ --replace "/etc" "$out/etc" \ --replace "/usr/share" "$out/share" + runHook postConfigure ''; buildPhase = '' + runHook preBuild qmake PREFIX=$out make + runHook postBuild ''; postInstall = ''