about summary refs log tree commit diff
path: root/pkgs/development/libraries/gstreamer
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2019-07-25 12:36:10 +0000
committerGitHub <noreply@github.com>2019-07-25 12:36:10 +0000
commit22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3 (patch)
tree908ccf1f0ce71304efd681834a4a6908bbff4f52 /pkgs/development/libraries/gstreamer
parente1e5c87f83b80d17f15f6e6bc67e1d6b4a7d2a66 (diff)
parent9332773e5108b096d1e67fb01158cd1a9530e0b0 (diff)
downloadnixlib-22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3.tar
nixlib-22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3.tar.gz
nixlib-22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3.tar.bz2
nixlib-22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3.tar.lz
nixlib-22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3.tar.xz
nixlib-22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3.tar.zst
nixlib-22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3.zip
Merge pull request #65305 from averelld/disable-zbar-wine-gstreamer
wine: disable zbar in gst-plugins-bad
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
-rw-r--r--pkgs/development/libraries/gstreamer/bad/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index ba59a2514375..2ae0ad2b453b 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -2,6 +2,7 @@
 , config
 , pkgconfig, python3, gst-plugins-base, orc
 , gobject-introspection
+, enableZbar ? true
 , faacSupport ? false, faac ? null
 , faad2, libass, libkate, libmms, librdf, ladspaH
 , libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
@@ -136,13 +137,13 @@ stdenv.mkDerivation rec {
     soundtouch
     spandsp
     srtp
-    zbar
     fluidsynth libvdpau
     libwebp xvidcore gnutls libGLU_combined
     libgme openssl x265 libxml2
     libintl
     srt
   ]
+    ++ optional enableZbar zbar
     ++ optional faacSupport faac
     ++ optional stdenv.isLinux wayland
     # wildmidi requires apple's OpenAL
@@ -158,6 +159,7 @@ stdenv.mkDerivation rec {
     "-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"
+    "-Dzbar=${if enableZbar then "enabled" else "disabled"}"
     "-Dfaac=${if faacSupport then "enabled" else "disabled"}"
     "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing
     "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support