diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-23 15:57:28 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-31 21:15:03 -0600 |
| commit | 5337a2a4b33027e157e6d5d575e614038554bdf0 (patch) | |
| tree | c9a50d596d16115fa9f6e4bc612e61472ab2de01 /pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | |
| parent | fcf290cd1d184f34d4d2fba517b385611e191c63 (diff) | |
| download | nixpkgs-5337a2a4b33027e157e6d5d575e614038554bdf0.tar nixpkgs-5337a2a4b33027e157e6d5d575e614038554bdf0.tar.gz nixpkgs-5337a2a4b33027e157e6d5d575e614038554bdf0.tar.bz2 nixpkgs-5337a2a4b33027e157e6d5d575e614038554bdf0.tar.lz nixpkgs-5337a2a4b33027e157e6d5d575e614038554bdf0.tar.xz nixpkgs-5337a2a4b33027e157e6d5d575e614038554bdf0.tar.zst nixpkgs-5337a2a4b33027e157e6d5d575e614038554bdf0.zip | |
qt55.qtbase: don't propagate cups 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 65afcb4119e..212db01ea01 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 (cups != null) cups ++ lib.optional (mysql != null) mysql.lib ++ 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 developerBuild gdb + ++ lib.optional (cups != null) cups; nativeBuildInputs = [ python perl pkgconfig ]; |