From 84ed4737635c068e716a8fc286b081bfe5d1febc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 13:34:03 -0500
Subject: [PATCH] notepadqq: correct packaging errors and pin to Qt 5.6

---
 pkgs/applications/editors/notepadqq/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 0de33d6d194..b553e09ed5e 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, which, qtbase }:
+{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
 
 let
   version = "0.53.0";
@@ -12,11 +12,11 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    pkgconfig which
+    pkgconfig which qttools
   ];
 
   buildInputs = [
-    qtbase.qtsvg qtbase.qtwebkit qtbase.qttools
+    qtbase qtsvg qtwebkit
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2004b75dda0..3842d138182 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14804,9 +14804,7 @@ with pkgs;
 
   nedit = callPackage ../applications/editors/nedit { };
 
-  notepadqq = callPackage ../applications/editors/notepadqq {
-    qtbase = qt55;
-  };
+  notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch { };