mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

Merge pull request #51214 from rnhmjoj/wine

Browse source 
winePackages.wine: add SDL support
This commit is contained in:
Alyssa Ross 2018-12-07 22:44:13 +00:00 committed by GitHub
parent 7574d4ef15 ff74da41fd
commit 0e8e02e686
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional xineramaSupport pkgs.xorg.libXinerama
++ lib.optional udevSupport pkgs.udev
++ lib.optional vulkanSupport pkgs.vulkan-loader
++ lib.optional sdlSupport pkgs.SDL2
++ 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 ]

3
pkgs/misc/emulators/wine/default.nix
View file

@ -42,6 +42,7 @@
xineramaSupport ? false,
xmlSupport ? false,
vulkanSupport ? false,
sdlSupport ? false,
}:
let wine-build = build: release:
@ -53,7 +54,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 vulkanSupport;
openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport;
};
});

1
pkgs/top-level/wine-packages.nix
View file

@ -25,6 +25,7 @@ rec {
udevSupport = true;
xineramaSupport = true;
xmlSupport = true;
sdlSupport = true;
};
full = base.override {