From c1f0f62a9cf916b579fa7d8be1a98ffd5b266d44 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Jan 2016 09:30:57 -0600 Subject: [PATCH] qt54.qtbase: don't propagate cups dependency It is not necessary to propagate the cups buildInput if Qt is configured with cups 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 b22f90d5daf..088cf8fd48f 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 (cups != null) cups ++ 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 developerBuild gdb + ++ lib.optional (cups != null) cups; nativeBuildInputs = [ python perl pkgconfig ];