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

Fix QGtkStyle for Qt 5 versions

Browse Source
This commit is contained in:
Thomas Tuegel 2015-05-19 08:11:42 -05:00
parent e697219d3d
commit b84f3e85d9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/5.3/default.nix
View File

@ -119,6 +119,7 @@ stdenv.mkDerivation rec {
-xcb -xcb
-qpa xcb -qpa xcb
-${optionalString (cups == null) "no-"}cups -${optionalString (cups == null) "no-"}cups
-${optionalString (!gtkStyle) "no-"}gtkstyle
-no-eglfs -no-eglfs
-no-directfb -no-directfb
@ -155,7 +156,8 @@ stdenv.mkDerivation rec {
++ optionals mesaSupported [ mesa mesa_glu ] ++ optionals mesaSupported [ mesa mesa_glu ]
++ optional (cups != null) cups ++ optional (cups != null) cups
++ optional (mysql != null) mysql.lib ++ optional (mysql != null) mysql.lib
++ optional (postgresql != null) postgresql; ++ optional (postgresql != null) postgresql
++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
buildInputs = [ gdb bison flex gperf ruby ]; buildInputs = [ gdb bison flex gperf ruby ];

4
pkgs/development/libraries/qt-5/5.4/qtbase.nix
View File

@ -115,6 +115,7 @@ stdenv.mkDerivation {
-xcb -xcb
-qpa xcb -qpa xcb
-${optionalString (cups == null) "no-"}cups -${optionalString (cups == null) "no-"}cups
-${optionalString (!gtkStyle) "no-"}gtkstyle
-no-eglfs -no-eglfs
-no-directfb -no-directfb
@ -150,7 +151,8 @@ stdenv.mkDerivation {
++ optionals mesaSupported [ mesa mesa_glu ] ++ optionals mesaSupported [ mesa mesa_glu ]
++ optional (cups != null) cups ++ optional (cups != null) cups
++ optional (mysql != null) mysql.lib ++ optional (mysql != null) mysql.lib
++ optional (postgresql != null) postgresql; ++ optional (postgresql != null) postgresql
++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
buildInputs = [ gdb bison flex gperf ruby ]; buildInputs = [ gdb bison flex gperf ruby ];