nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues 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
commit 2326fd2d53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -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 ]

6
pkgs/misc/emulators/wine/default.nix
View File

@ -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;
};
});

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

@ -21191,6 +21191,7 @@ with pkgs;
fontconfigSupport = true;
alsaSupport = true;
openglSupport = true;
vulkanSupport = stdenv.isLinux;
tlsSupport = true;
cupsSupport = true;
dbusSupport = true;