diff options
| author | Marcin Falkiewicz <avalatron@gmail.com> | 2018-04-23 16:02:12 +0200 |
|---|---|---|
| committer | Marcin Falkiewicz <avalatron@gmail.com> | 2018-04-24 14:47:12 +0200 |
| commit | 0fad5f7a8445d2848878789f2d1b9b01fc13c18f (patch) | |
| tree | 39c7e6bd6c3fa35b17b00a72a072a07ba745d01d /pkgs/misc/emulators | |
| parent | 93324dbfa6a003476eb84d4532c8f629578bf6a0 (diff) | |
| download | nixlib-0fad5f7a8445d2848878789f2d1b9b01fc13c18f.tar nixlib-0fad5f7a8445d2848878789f2d1b9b01fc13c18f.tar.gz nixlib-0fad5f7a8445d2848878789f2d1b9b01fc13c18f.tar.bz2 nixlib-0fad5f7a8445d2848878789f2d1b9b01fc13c18f.tar.lz nixlib-0fad5f7a8445d2848878789f2d1b9b01fc13c18f.tar.xz nixlib-0fad5f7a8445d2848878789f2d1b9b01fc13c18f.tar.zst nixlib-0fad5f7a8445d2848878789f2d1b9b01fc13c18f.zip | |
wine: add Vulkan support
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db58c398526a..864b8fac96fc 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev + ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ 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 gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 91fb0da82d8a..ca67ca836ba0 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -40,7 +40,9 @@ pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, - xmlSupport ? false }: + xmlSupport ? false, + vulkanSupport ? false, +}: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { @@ -51,7 +53,7 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport; + openglSupport gstreamerSupport udevSupport vulkanSupport; }; }); |