From a6fd9e9be6754180abc9ec1854b80586e7d66d05 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Jan 2016 09:33:45 -0600 Subject: [PATCH] qt54.qtbase: don't propagate gtk dependencies It is not necessary to propagate the GTK dependencies if Qt is configured with the GTK Style enabled. --- pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix index 4ec93242e1f3..e7a1fba90623 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix @@ -187,15 +187,15 @@ stdenv.mkDerivation { ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and # doesn't remain a runtime-dep if not used - ++ lib.optionals mesaSupported [ mesa mesa_glu ] - ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + ++ lib.optionals mesaSupported [ mesa mesa_glu ]; buildInputs = [ bison flex gperf ruby ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql; + ++ lib.optional (postgresql != null) postgresql + ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; nativeBuildInputs = [ python perl pkgconfig ];