diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-07-25 12:36:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 12:36:10 +0000 |
| commit | 22f5ee4e0e9c4cac406e44e420bdd907f2f2dbd3 (patch) | |
| tree | 908ccf1f0ce71304efd681834a4a6908bbff4f52 /pkgs/misc | |
| parent | e1e5c87f83b80d17f15f6e6bc67e1d6b4a7d2a66 (diff) | |
| parent | 9332773e5108b096d1e67fb01158cd1a9530e0b0 (diff) | |
| download | nixlib-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/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 8edf7ad39597..01d096599155 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -46,7 +46,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ 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 openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] |