diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-26 14:45:31 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-26 14:45:31 +0200 |
| commit | 0f6bda38fe1148d191cf619e69cb47f17cc184cf (patch) | |
| tree | dc4c8d532343cbcca9d4f22e31021dd8436f8c59 /pkgs/misc/emulators | |
| parent | 883a1dffcfe4734a3b13a034869e94edafc90322 (diff) | |
| parent | c9793b81b8f72dd291e0ba14724bbbf96c2a5309 (diff) | |
| download | nixlib-0f6bda38fe1148d191cf619e69cb47f17cc184cf.tar nixlib-0f6bda38fe1148d191cf619e69cb47f17cc184cf.tar.gz nixlib-0f6bda38fe1148d191cf619e69cb47f17cc184cf.tar.bz2 nixlib-0f6bda38fe1148d191cf619e69cb47f17cc184cf.tar.lz nixlib-0f6bda38fe1148d191cf619e69cb47f17cc184cf.tar.xz nixlib-0f6bda38fe1148d191cf619e69cb47f17cc184cf.tar.zst nixlib-0f6bda38fe1148d191cf619e69cb47f17cc184cf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc/emulators')
| -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 ] |