public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39404 from dwe11er/wine-vulkan

Browse Source 
wine: add vulkanSupport option
This commit is contained in:
Jörg Thalheim
2018-05-07 16:25:50 +01:00
committed by GitHub
parent 66b2c898f0 0fad5f7a84
commit 2326fd2d53
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/wine/base.nix
+1
View File
@@ -47,6 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional xineramaSupport pkgs.xorg.libXinerama
++ lib.optional udevSupport pkgs.udev ++ 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 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 gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
pkgs/misc/emulators/wine/default.nix
+4 -2
View File
@@ -40,7 +40,9 @@
pulseaudioSupport ? false, pulseaudioSupport ? false,
udevSupport ? false, udevSupport ? false,
xineramaSupport ? false, xineramaSupport ? false,
xmlSupport ? false }: xmlSupport ? false,
vulkanSupport ? false,
}:
let wine-build = build: release: let wine-build = build: release:
lib.getAttr build (callPackage ./packages.nix { lib.getAttr build (callPackage ./packages.nix {
@@ -51,7 +53,7 @@ let wine-build = build: release:
netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
openglSupport gstreamerSupport udevSupport; openglSupport gstreamerSupport udevSupport vulkanSupport;
}; };
}); });
pkgs/top-level/all-packages.nix
+1
View File
@@ -21191,6 +21191,7 @@ with pkgs;
fontconfigSupport = true; fontconfigSupport = true;
alsaSupport = true; alsaSupport = true;
openglSupport = true; openglSupport = true;
vulkanSupport = stdenv.isLinux;
tlsSupport = true; tlsSupport = true;
cupsSupport = true; cupsSupport = true;
dbusSupport = true; dbusSupport = true;