From 5faed29fa8f4c437bbf0d8ecbf045cadecf6e172 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH] cutegram: move to qmakeHook This reverts commit 7f4ab1cb72cc4779b91384474b6b23e4744033d1. --- .../instant-messengers/telegram/cutegram/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 07bfcf3a03e0..bc517cadf522 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -3,7 +3,7 @@ , qtimageformats, qtgraphicaleffects , telegram-qml, libqtelegram-aseman-edition , gst_all_1 -, makeQtWrapper }: +, makeQtWrapper, qmakeHook }: stdenv.mkDerivation rec { name = "cutegram-${meta.version}"; @@ -20,16 +20,10 @@ stdenv.mkDerivation rec { telegram-qml libqtelegram-aseman-edition ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]); - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; enableParallelBuilding = true; - configurePhase = '' - runHook preConfigure - qmake -r PREFIX=$out - runHook postConfigure - ''; - fixupPhase = '' wrapQtProgram $out/bin/cutegram \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"