From fa56e5ffa78fde8724b661172bc4bbad049fa21c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 7 Feb 2015 07:30:18 -0600
Subject: [PATCH] qt5: move monolithic build

---
 .../libraries/qt-5/{ => 5.3}/0001-dlopen-gtkstyle.patch         | 0
 .../libraries/qt-5/{ => 5.3}/0002-dlopen-webkit-nsplugin.patch  | 0
 pkgs/development/libraries/qt-5/{ => 5.3}/0003-glib-2.32.patch  | 0
 .../libraries/qt-5/{ => 5.3}/0004-dlopen-resolv.patch           | 0
 pkgs/development/libraries/qt-5/{ => 5.3}/0005-dlopen-gl.patch  | 0
 pkgs/development/libraries/qt-5/{ => 5.3}/0006-tzdir.patch      | 0
 .../libraries/qt-5/{ => 5.3}/0007-dlopen-webkit-gtk.patch       | 0
 .../libraries/qt-5/{ => 5.3}/0008-dlopen-webkit-udev.patch      | 0
 .../libraries/qt-5/{ => 5.3}/0009-dlopen-serialport-udev.patch  | 0
 .../libraries/qt-5/{ => 5.3}/0010-dlopen-libXcursor.patch       | 0
 .../libraries/qt-5/{ => 5.3}/0011-dlopen-openssl.patch          | 0
 .../development/libraries/qt-5/{ => 5.3}/0012-dlopen-dbus.patch | 0
 pkgs/development/libraries/qt-5/{ => 5.3}/default.nix           | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 14 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0001-dlopen-gtkstyle.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0002-dlopen-webkit-nsplugin.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0003-glib-2.32.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0004-dlopen-resolv.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0005-dlopen-gl.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0006-tzdir.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0007-dlopen-webkit-gtk.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0008-dlopen-webkit-udev.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0009-dlopen-serialport-udev.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0010-dlopen-libXcursor.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0011-dlopen-openssl.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/0012-dlopen-dbus.patch (100%)
 rename pkgs/development/libraries/qt-5/{ => 5.3}/default.nix (100%)

diff --git a/pkgs/development/libraries/qt-5/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.3/0001-dlopen-gtkstyle.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0001-dlopen-gtkstyle.patch
rename to pkgs/development/libraries/qt-5/5.3/0001-dlopen-gtkstyle.patch
diff --git a/pkgs/development/libraries/qt-5/0002-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.3/0002-dlopen-webkit-nsplugin.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0002-dlopen-webkit-nsplugin.patch
rename to pkgs/development/libraries/qt-5/5.3/0002-dlopen-webkit-nsplugin.patch
diff --git a/pkgs/development/libraries/qt-5/0003-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.3/0003-glib-2.32.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0003-glib-2.32.patch
rename to pkgs/development/libraries/qt-5/5.3/0003-glib-2.32.patch
diff --git a/pkgs/development/libraries/qt-5/0004-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.3/0004-dlopen-resolv.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0004-dlopen-resolv.patch
rename to pkgs/development/libraries/qt-5/5.3/0004-dlopen-resolv.patch
diff --git a/pkgs/development/libraries/qt-5/0005-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.3/0005-dlopen-gl.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0005-dlopen-gl.patch
rename to pkgs/development/libraries/qt-5/5.3/0005-dlopen-gl.patch
diff --git a/pkgs/development/libraries/qt-5/0006-tzdir.patch b/pkgs/development/libraries/qt-5/5.3/0006-tzdir.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0006-tzdir.patch
rename to pkgs/development/libraries/qt-5/5.3/0006-tzdir.patch
diff --git a/pkgs/development/libraries/qt-5/0007-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.3/0007-dlopen-webkit-gtk.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0007-dlopen-webkit-gtk.patch
rename to pkgs/development/libraries/qt-5/5.3/0007-dlopen-webkit-gtk.patch
diff --git a/pkgs/development/libraries/qt-5/0008-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.3/0008-dlopen-webkit-udev.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0008-dlopen-webkit-udev.patch
rename to pkgs/development/libraries/qt-5/5.3/0008-dlopen-webkit-udev.patch
diff --git a/pkgs/development/libraries/qt-5/0009-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.3/0009-dlopen-serialport-udev.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0009-dlopen-serialport-udev.patch
rename to pkgs/development/libraries/qt-5/5.3/0009-dlopen-serialport-udev.patch
diff --git a/pkgs/development/libraries/qt-5/0010-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.3/0010-dlopen-libXcursor.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0010-dlopen-libXcursor.patch
rename to pkgs/development/libraries/qt-5/5.3/0010-dlopen-libXcursor.patch
diff --git a/pkgs/development/libraries/qt-5/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.3/0011-dlopen-openssl.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0011-dlopen-openssl.patch
rename to pkgs/development/libraries/qt-5/5.3/0011-dlopen-openssl.patch
diff --git a/pkgs/development/libraries/qt-5/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.3/0012-dlopen-dbus.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/0012-dlopen-dbus.patch
rename to pkgs/development/libraries/qt-5/5.3/0012-dlopen-dbus.patch
diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/default.nix
rename to pkgs/development/libraries/qt-5/5.3/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1f8ff82253..5686b9298c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7022,7 +7022,7 @@ let
     qtLib = qt48Full;
   };
 
-  qt5 = callPackage ../development/libraries/qt-5 {
+  qt5 = callPackage ../development/libraries/qt-5/5.3 {
     mesa = mesa_noglu;
     cups = if stdenv.isLinux then cups else null;
     # GNOME dependencies are not used unless gtkStyle == true