about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-16 22:59:17 +0300
committerNikolay Amiantov <ab@fmap.me>2016-04-20 18:55:50 +0300
commit068c7b68a2b9b349f467d3ea18cf8a6726085a94 (patch)
treee9cafebf69c381b764318e903822eb1f50f5bba6 /pkgs/development/libraries
parent31d6dd6be0b4d5a376f7ef2cc2039265f71b79dd (diff)
downloadnixlib-068c7b68a2b9b349f467d3ea18cf8a6726085a94.tar
nixlib-068c7b68a2b9b349f467d3ea18cf8a6726085a94.tar.gz
nixlib-068c7b68a2b9b349f467d3ea18cf8a6726085a94.tar.bz2
nixlib-068c7b68a2b9b349f467d3ea18cf8a6726085a94.tar.lz
nixlib-068c7b68a2b9b349f467d3ea18cf8a6726085a94.tar.xz
nixlib-068c7b68a2b9b349f467d3ea18cf8a6726085a94.tar.zst
nixlib-068c7b68a2b9b349f467d3ea18cf8a6726085a94.zip
accounts-qt: move to qmakeHook
This reverts commit 25382a37e38d92113ae671f0f2d6f1be9045015e.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/accounts-qt/default.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index e82d37f1d3c7..a16a0ef8cf5b 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase }:
+{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmakeHook }:
 
 stdenv.mkDerivation rec {
   name = "accounts-qt-${version}";
@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ glib libaccounts-glib qtbase ];
-  nativeBuildInputs = [ doxygen pkgconfig ];
+  nativeBuildInputs = [ doxygen pkgconfig qmakeHook ];
 
-  configurePhase = ''
-    runHook preConfigure
-    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
-    runHook postConfigure
+  preConfigure = ''
+    qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake"
   '';
 
   meta = with stdenv.lib; {