diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-05-07 16:25:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 16:25:50 +0100 |
| commit | 2326fd2d532ebebfa409f15a549cb29dbbb12198 (patch) | |
| tree | cf365b647a8eb5d88c3bcdc3ac4566d20e3166b7 /pkgs/misc | |
| parent | 66b2c898f0f2e65efb99fcf485c14e69063efc80 (diff) | |
| parent | 0fad5f7a8445d2848878789f2d1b9b01fc13c18f (diff) | |
| download | nixlib-2326fd2d532ebebfa409f15a549cb29dbbb12198.tar nixlib-2326fd2d532ebebfa409f15a549cb29dbbb12198.tar.gz nixlib-2326fd2d532ebebfa409f15a549cb29dbbb12198.tar.bz2 nixlib-2326fd2d532ebebfa409f15a549cb29dbbb12198.tar.lz nixlib-2326fd2d532ebebfa409f15a549cb29dbbb12198.tar.xz nixlib-2326fd2d532ebebfa409f15a549cb29dbbb12198.tar.zst nixlib-2326fd2d532ebebfa409f15a549cb29dbbb12198.zip | |
Merge pull request #39404 from dwe11er/wine-vulkan
wine: add vulkanSupport option
Diffstat (limited to 'pkgs/misc')
| -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 0b71797eeec8..e06460994150 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -47,6 +47,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; }; }); |