diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-23 15:58:25 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-31 21:15:03 -0600 |
commit | 4b844747a27bc0522a19f91b10a0c0326eaeaaca (patch) | |
tree | ba4d0a5870d3fbece89a0a92e965b28ac74e2a30 /pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | |
parent | d5d75546397c03959cf5231786f16bb81a64cf39 (diff) | |
download | nixpkgs-4b844747a27bc0522a19f91b10a0c0326eaeaaca.tar nixpkgs-4b844747a27bc0522a19f91b10a0c0326eaeaaca.tar.gz nixpkgs-4b844747a27bc0522a19f91b10a0c0326eaeaaca.tar.bz2 nixpkgs-4b844747a27bc0522a19f91b10a0c0326eaeaaca.tar.lz nixpkgs-4b844747a27bc0522a19f91b10a0c0326eaeaaca.tar.xz nixpkgs-4b844747a27bc0522a19f91b10a0c0326eaeaaca.tar.zst nixpkgs-4b844747a27bc0522a19f91b10a0c0326eaeaaca.zip |
qt55.qtbase: don't propagate postgresql dependency
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.5/qtbase/default.nix')
-rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 4 |
1 files changed, 2 insertions, 2 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 b7a6203aeb9..91de7b76929 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -185,14 +185,14 @@ 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.optional (postgresql != null) postgresql ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf]; buildInputs = [ bison flex gperf ruby ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib; + ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = [ python perl pkgconfig ]; |