From 05dbd07cd14c50b5ad60ae0f060dd95767f87b1e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 19 Dec 2015 18:48:09 -0600
Subject: [PATCH] pyqt5: Qt 5 infrastructure update

---
 pkgs/development/python-modules/pyqt/5.x.nix | 5 +++--
 pkgs/top-level/python-packages.nix           | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index bb1d91b3ca83..c2e5cb1a763e 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, python, pkgconfig, qt5, sip, pythonDBus, lndir, makeWrapper }:
+{ stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus
+, lndir, makeWrapper }:
 
 let
   version = "5.4.2";
@@ -20,7 +21,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [
     python pkgconfig makeWrapper lndir
-    qt5.base qt5.svg qt5.webkit
+    qtbase qtsvg qtwebkit
   ];
 
   propagatedBuildInputs = [ sip ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a952fb7c76b1..112a7f0da867 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -166,7 +166,7 @@ in modules // {
   pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
     sip = self.sip_4_16;
     pythonDBus = self.dbus;
-    qt5 = pkgs.qt5;
+    inherit (pkgs.qt5) qtbase qtsvg qtwebkit;
   };
 
   pyside = callPackage ../development/python-modules/pyside { };