summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-01-23 15:58:00 -0600
committerThomas Tuegel <ttuegel@gmail.com>2016-01-31 21:15:03 -0600
commitd5d75546397c03959cf5231786f16bb81a64cf39 (patch)
treebc08274f5aa00c9bd2ca38540617c3a7b74d6084 /pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
parent5337a2a4b33027e157e6d5d575e614038554bdf0 (diff)
downloadnixpkgs-d5d75546397c03959cf5231786f16bb81a64cf39.tar
nixpkgs-d5d75546397c03959cf5231786f16bb81a64cf39.tar.gz
nixpkgs-d5d75546397c03959cf5231786f16bb81a64cf39.tar.bz2
nixpkgs-d5d75546397c03959cf5231786f16bb81a64cf39.tar.lz
nixpkgs-d5d75546397c03959cf5231786f16bb81a64cf39.tar.xz
nixpkgs-d5d75546397c03959cf5231786f16bb81a64cf39.tar.zst
nixpkgs-d5d75546397c03959cf5231786f16bb81a64cf39.zip
qt55.qtbase: don't propagate mysql 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.nix4
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 212db01ea01..b7a6203aeb9 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 (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 (cups != null) cups;
+    ++ lib.optional (cups != null) cups
+    ++ lib.optional (mysql != null) mysql.lib;
 
   nativeBuildInputs = [ python perl pkgconfig ];