diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:00:18 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
| commit | 2c024d28a219f3283d8adb10049162bd45332eb8 (patch) | |
| tree | 595ae87773621b39b5e8ebad1f1c2f47d2df57ee /pkgs/tools/networking/cmst/default.nix | |
| parent | f1c2572479265d121d55d9e3270dc1ebfee4aa00 (diff) | |
| download | nixpkgs-2c024d28a219f3283d8adb10049162bd45332eb8.tar nixpkgs-2c024d28a219f3283d8adb10049162bd45332eb8.tar.gz nixpkgs-2c024d28a219f3283d8adb10049162bd45332eb8.tar.bz2 nixpkgs-2c024d28a219f3283d8adb10049162bd45332eb8.tar.lz nixpkgs-2c024d28a219f3283d8adb10049162bd45332eb8.tar.xz nixpkgs-2c024d28a219f3283d8adb10049162bd45332eb8.tar.zst nixpkgs-2c024d28a219f3283d8adb10049162bd45332eb8.zip | |
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/tools/networking/cmst/default.nix')
| -rw-r--r-- | pkgs/tools/networking/cmst/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
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 = '' |