BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt4: drop multimedia & webkit options

Browse source 
They have been broken and disabled for ages and now the dependencies are being removed.
This commit is contained in:
Jan Tojnar 2020-09-02 02:13:41 +02:00
parent 840116150c
commit e68e048e50
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -3,9 +3,7 @@
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, libGLU, openssl, dbus, cups, pkgconfig , libmng, which, libGLU, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
, buildMultimedia ? false # ancient gstreamer is broken , alsaLib
, alsaLib, gstreamer, gst-plugins-base
, buildWebkit ? false
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, flashplayerFix ? false, gdk-pixbuf , flashplayerFix ? false, gdk-pixbuf
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
@ -178,7 +176,7 @@ stdenv.mkDerivation rec {
"-exceptions" "-xmlpatterns" "-exceptions" "-xmlpatterns"
"-make" "libs" "-make" "tools" "-make" "translations" "-make" "libs" "-make" "tools" "-make" "translations"
"-no-phonon" (mk buildWebkit "webkit") (mk buildMultimedia "multimedia") "-audio-backend" "-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend"
]) ++ [ ]) ++ [
"-${if demos then "" else "no"}make" "demos" "-${if demos then "" else "no"}make" "demos"
"-${if examples then "" else "no"}make" "examples" "-${if examples then "" else "no"}make" "examples"
@ -191,9 +189,7 @@ stdenv.mkDerivation rec {
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
libSM zlib libpng openssl dbus freetype fontconfig glib ] libSM zlib libpng openssl dbus freetype fontconfig glib ]
# 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 # 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.optional libGLSupported libGLU ++ lib.optional libGLSupported libGLU;
++ lib.optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
++ lib.optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
# The following libraries are only used in plugins # The following libraries are only used in plugins
buildInputs = buildInputs =