From 4ed8d5d1251e63abc44dcfb540a4594268c499f3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Jan 2016 10:51:22 -0600 Subject: [PATCH] qt54.qtbase: don't propagate extra Mesa dependency The note accompanying this dependency says "it's small and doesn't remain a runtime-dep if not used," but *neither* of those statements is true. --- pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 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 e7a1fba90623..eabc03b2b327 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix @@ -14,7 +14,7 @@ , mysql ? null, postgresql ? null # options -, mesaSupported, mesa, mesa_glu +, mesaSupported, mesa , buildDocs ? false , buildExamples ? false , buildTests ? false @@ -185,9 +185,7 @@ stdenv.mkDerivation { zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] - # 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 mesaSupported mesa; buildInputs = [ bison flex gperf ruby ]