From 294d1f4c704fd82f25ea9652a3a30811ae082aa0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Sat, 16 Apr 2016 22:59:17 +0300 Subject: [PATCH] cmst: move to qmakeHook This reverts commit 2c024d28a219f3283d8adb10049162bd45332eb8. --- pkgs/tools/networking/cmst/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 5c8b801dbbe3..d9c6c2630fa6 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, makeWrapper, libX11 }: +{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }: stdenv.mkDerivation rec { name = "cmst-2016.01.28"; @@ -10,10 +10,9 @@ stdenv.mkDerivation rec { owner = "andrew-bibb"; }; - buildInputs = [ qtbase makeWrapper ]; + buildInputs = [ qtbase makeWrapper qmakeHook ]; - configurePhase = '' - runHook preConfigure + preConfigure = '' substituteInPlace ./cmst.pro \ --replace "/usr/bin" "$out/bin" \ --replace "/usr/share" "$out/usr/share" @@ -29,14 +28,6 @@ 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 = ''