From b69940ee7686897e743d3083a226314d491b57cc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Apr 2016 02:46:33 +0300
Subject: [PATCH] qscintilla: move to qmake4Hook

---
 pkgs/development/libraries/qscintilla/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                   | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 26d412e5a8cb..bc44f53fa6ef 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt }:
+{ stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   pname = "qscintilla";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
   };
 
-  buildInputs = [ qt ];
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ qmake4Hook ];
 
   preConfigure = ''
     cd Qt4Qt5
@@ -20,7 +21,6 @@ stdenv.mkDerivation rec {
            -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
            -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
            qscintilla.pro
-    qmake qscintilla.pro
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 007c8df4f07e..ded7ed829d63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2986,9 +2986,7 @@ in
 
   qprint = callPackage ../tools/text/qprint { };
 
-  qscintilla = callPackage ../development/libraries/qscintilla {
-    qt = qt4;
-  };
+  qscintilla = callPackage ../development/libraries/qscintilla { };
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };