From 79008f6095acaa0b5d5e6c8af708d691e2c7adf8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:17 +0300 Subject: [PATCH] signon: move to qmakeHook This reverts commit 96bed5b7aa92157586857255901d29de9ab05723. --- pkgs/development/libraries/signon/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix index 2da555635b2..f2f7de5b712 100644 --- a/pkgs/development/libraries/signon/default.nix +++ b/pkgs/development/libraries/signon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, doxygen, qtbase }: +{ stdenv, fetchurl, doxygen, qtbase, qmakeHook }: stdenv.mkDerivation rec { name = "signon-${version}"; @@ -9,12 +9,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase ]; - nativeBuildInputs = [ doxygen ]; + nativeBuildInputs = [ doxygen qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5" ''; }