From 1237d0b8208c41b11b0fd60fa7cf90b903d764b9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 16 Apr 2016 22:59:20 +0300
Subject: [PATCH] cool-retro-term: move to qmakeHook
This reverts commit 44a2ca4a34ceb49b339ed8828d1ce6c5ecd493af.
---
pkgs/applications/misc/cool-retro-term/default.nix | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 67b9b601139..9ffa36adc12 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
-qtquickcontrols, qtgraphicaleffects }:
+qtquickcontrols, qtgraphicaleffects, qmakeHook }:
stdenv.mkDerivation rec {
version = "1.0.0";
@@ -17,15 +17,9 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
- nativeBuildInputs = [ makeQtWrapper ];
+ nativeBuildInputs = [ makeQtWrapper qmakeHook ];
- configurePhase = ''
- runHook preConfigure
- qmake PREFIX=$out
- runHook postConfigure
- '';
-
- installPhase = "make -j $NIX_BUILD_CORES INSTALL_ROOT=$out install";
+ installFlags = [ "INSTALL_ROOT=$(out)" ];
preFixup = ''
mv $out/usr/share $out/share