diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 22:59:17 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:56 +0300 |
| commit | 294d1f4c704fd82f25ea9652a3a30811ae082aa0 (patch) | |
| tree | 3440f052b762aa641fdc86fb46ae88d8e2d80591 /pkgs/tools/networking/cmst | |
| parent | 8ab48c32e7a3053ea5198c22c5881c93644c8a9c (diff) | |
| download | nixlib-294d1f4c704fd82f25ea9652a3a30811ae082aa0.tar nixlib-294d1f4c704fd82f25ea9652a3a30811ae082aa0.tar.gz nixlib-294d1f4c704fd82f25ea9652a3a30811ae082aa0.tar.bz2 nixlib-294d1f4c704fd82f25ea9652a3a30811ae082aa0.tar.lz nixlib-294d1f4c704fd82f25ea9652a3a30811ae082aa0.tar.xz nixlib-294d1f4c704fd82f25ea9652a3a30811ae082aa0.tar.zst nixlib-294d1f4c704fd82f25ea9652a3a30811ae082aa0.zip | |
cmst: move to qmakeHook
This reverts commit 2c024d28a219f3283d8adb10049162bd45332eb8.
Diffstat (limited to 'pkgs/tools/networking/cmst')
| -rw-r--r-- | pkgs/tools/networking/cmst/default.nix | 15 |
1 files 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 = '' |