public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65305 from averelld/disable-zbar-wine-gstreamer

Browse Source 
wine: disable zbar in gst-plugins-bad
This commit is contained in:
Michael Raskin 2019-07-25 12:36:10 +00:00 committed by GitHub
commit 22f5ee4e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -2,6 +2,7 @@
, config , config
, pkgconfig, python3, gst-plugins-base, orc , pkgconfig, python3, gst-plugins-base, orc
, gobject-introspection , gobject-introspection
, enableZbar ? true
, faacSupport ? false, faac ? null , faacSupport ? false, faac ? null
, faad2, libass, libkate, libmms, librdf, ladspaH , faad2, libass, libkate, libmms, librdf, ladspaH
, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom , libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
@ -136,13 +137,13 @@ stdenv.mkDerivation rec {
soundtouch soundtouch
spandsp spandsp
srtp srtp
zbar
fluidsynth libvdpau fluidsynth libvdpau
libwebp xvidcore gnutls libGLU_combined libwebp xvidcore gnutls libGLU_combined
libgme openssl x265 libxml2 libgme openssl x265 libxml2
libintl libintl
srt srt
] ]
++ optional enableZbar zbar
++ optional faacSupport faac ++ optional faacSupport faac
++ optional stdenv.isLinux wayland ++ optional stdenv.isLinux wayland
# wildmidi requires apple's OpenAL # wildmidi requires apple's OpenAL
@ -158,6 +159,7 @@ stdenv.mkDerivation rec {
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
"-Dzbar=${if enableZbar then "enabled" else "disabled"}"
"-Dfaac=${if faacSupport then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}"
"-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing
"-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support

4
pkgs/misc/emulators/wine/base.nix
View File

@ -46,7 +46,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional udevSupport pkgs.udev ++ lib.optional udevSupport pkgs.udev
++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optional vulkanSupport pkgs.vulkan-loader
++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional sdlSupport pkgs.SDL2
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
(gst-plugins-bad.override { enableZbar = false; }) ])
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]