From 6adce0a785b2876f48a9d73c02251b101f69c30b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:46 +0300 Subject: [PATCH] touchegg: move to qmake4Hook --- pkgs/tools/inputmethods/touchegg/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 4ac3c02d410..6ab53f9d763 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis, qmake4Hook }: stdenv.mkDerivation rec { name = "touchegg-${version}"; @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; - configurePhase = '' + nativeBuildInputs = [ qmake4Hook ]; + + preConfigure = '' sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) sed -e "s@/usr/@$out/@g" -i $(find ./src/touchegg/config/ -name Config.cpp) - qmake touchegg.pro ''; meta = { @@ -22,4 +23,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +}