From 5fb4e3b3388d124a561ae4943433a691ba198809 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Jan 2016 09:32:11 -0600 Subject: [PATCH] qt54.qtbase: don't propagate mysql dependency It is not necessary to propagate the mysql buildInput if Qt is configure with MySQL enabled. --- pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix index 088cf8fd48fe..ab86f95ece91 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix @@ -188,14 +188,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 libgnomeui 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 ];