alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

qt54.qtbase: don't propagate extra Mesa dependency

Browse source 
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.
This commit is contained in:
Thomas Tuegel 2016-01-23 10:51:22 -06:00
parent a6fd9e9be6
commit 4ed8d5d125
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
View file

@ -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 ]