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

wine: add Vulkan support

Browse Source
This commit is contained in:
Marcin Falkiewicz 2018-04-23 16:02:12 +02:00
parent 93324dbfa6
commit 0fad5f7a84
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/misc/emulators/wine/base.nix
View File

@ -48,6 +48,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 ]

6
pkgs/misc/emulators/wine/default.nix
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;
}; };
}); });

1
pkgs/top-level/all-packages.nix
View File

@ -21074,6 +21074,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;