From d5d75546397c03959cf5231786f16bb81a64cf39 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Jan 2016 15:58:00 -0600 Subject: [PATCH] qt55.qtbase: don't propagate mysql dependency --- pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 4 ++-- 1 file 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 212db01ea01d..b7a6203aeb94 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 ];