From 693b49166a76d775f94b5ca11a430e3ec33532ee Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 2 Jun 2016 16:44:40 +0300
Subject: [PATCH] qt5: remove gtkStyle option

It's no more needed now that we split QGtkStyle plugin
into separate output.
---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 9 +++++----
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 2cd129acab1d..f3badc24244c 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -19,7 +19,7 @@
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
-, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk
+, libgnomeui, GConf, gnome_vfs, gtk
 , decryptSslTraffic ? false
 }:
 
@@ -28,7 +28,7 @@ let
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 
   # Search path for Gtk plugin
-  gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ];
+  gtkLibPath = lib.makeLibraryPath [ gtk gnome_vfs libgnomeui GConf ];
 
   dontInvalidateBacking = fetchurl {
     url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
@@ -147,7 +147,7 @@ stdenv.mkDerivation {
     -xcb
     -qpa xcb
     -${lib.optionalString (cups == null) "no-"}cups
-    -${lib.optionalString (!gtkStyle) "no-"}gtkstyle
+    -gtkstyle
 
     -no-eglfs
     -no-directfb
@@ -210,7 +210,8 @@ stdenv.mkDerivation {
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysql != null) mysql.lib
     ++ lib.optional (postgresql != null) postgresql
-    ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
+    # FIXME: move to the main list on rebuild.
+    ++ [gnome_vfs.out libgnomeui.out gtk GConf];
 
   nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];
 
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index c28e6fcbb390..5b02190b0454 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -19,7 +19,7 @@
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
-, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk
+, libgnomeui, GConf, gnome_vfs, gtk
 , decryptSslTraffic ? false
 }:
 
@@ -28,7 +28,7 @@ let
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 
   # Search path for Gtk plugin
-  gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ];
+  gtkLibPath = lib.makeLibraryPath [ gtk gnome_vfs libgnomeui GConf ];
 in
 
 stdenv.mkDerivation {
@@ -141,7 +141,7 @@ stdenv.mkDerivation {
     -xcb
     -qpa xcb
     -${lib.optionalString (cups == null) "no-"}cups
-    -${lib.optionalString (!gtkStyle) "no-"}gtkstyle
+    -gtkstyle
 
     -no-eglfs
     -no-directfb
@@ -204,7 +204,8 @@ stdenv.mkDerivation {
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysql != null) mysql.lib
     ++ lib.optional (postgresql != null) postgresql
-    ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
+    # FIXME: move to the main list on rebuild.
+    ++ [gnome_vfs.out libgnomeui.out gtk GConf];
 
   nativeBuildInputs = [ lndir patchelf perl pkgconfig python ];