JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5: remove gtkStyle option

Browse Source 
It's no more needed now that we split QGtkStyle plugin
into separate output.
This commit is contained in:
Nikolay Amiantov 2016-06-02 16:44:40 +03:00
parent 83c2629f15
commit 693b49166a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View File

@ -19,7 +19,7 @@
, buildExamples ? false , buildExamples ? false
, buildTests ? false , buildTests ? false
, developerBuild ? false , developerBuild ? false
, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk , libgnomeui, GConf, gnome_vfs, gtk
, decryptSslTraffic ? false , decryptSslTraffic ? false
}: }:
@ -28,7 +28,7 @@ let
system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
# Search path for Gtk plugin # 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 { dontInvalidateBacking = fetchurl {
url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
@ -147,7 +147,7 @@ stdenv.mkDerivation {
-xcb -xcb
-qpa xcb -qpa xcb
-${lib.optionalString (cups == null) "no-"}cups -${lib.optionalString (cups == null) "no-"}cups
-${lib.optionalString (!gtkStyle) "no-"}gtkstyle -gtkstyle
-no-eglfs -no-eglfs
-no-directfb -no-directfb
@ -210,7 +210,8 @@ stdenv.mkDerivation {
++ lib.optional (cups != null) cups ++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib ++ lib.optional (mysql != null) mysql.lib
++ lib.optional (postgresql != null) postgresql ++ 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 ]; nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];

9
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
View File

@ -19,7 +19,7 @@
, buildExamples ? false , buildExamples ? false
, buildTests ? false , buildTests ? false
, developerBuild ? false , developerBuild ? false
, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk , libgnomeui, GConf, gnome_vfs, gtk
, decryptSslTraffic ? false , decryptSslTraffic ? false
}: }:
@ -28,7 +28,7 @@ let
system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
# Search path for Gtk plugin # 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -141,7 +141,7 @@ stdenv.mkDerivation {
-xcb -xcb
-qpa xcb -qpa xcb
-${lib.optionalString (cups == null) "no-"}cups -${lib.optionalString (cups == null) "no-"}cups
-${lib.optionalString (!gtkStyle) "no-"}gtkstyle -gtkstyle
-no-eglfs -no-eglfs
-no-directfb -no-directfb
@ -204,7 +204,8 @@ stdenv.mkDerivation {
++ lib.optional (cups != null) cups ++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib ++ lib.optional (mysql != null) mysql.lib
++ lib.optional (postgresql != null) postgresql ++ 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 ]; nativeBuildInputs = [ lndir patchelf perl pkgconfig python ];