public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/wine/base.nix
+1
View File
@@ -45,6 +45,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ 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.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 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
+2 -1
View File
@@ -42,6 +42,7 @@
xineramaSupport ? false, xineramaSupport ? false,
xmlSupport ? false, xmlSupport ? false,
vulkanSupport ? false, vulkanSupport ? false,
sdlSupport ? false,
}: }:
let wine-build = build: release: let wine-build = build: release:
@@ -53,7 +54,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 vulkanSupport; openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport;
}; };
}); });
pkgs/top-level/wine-packages.nix
+1
View File
@@ -25,6 +25,7 @@ rec {
udevSupport = true; udevSupport = true;
xineramaSupport = true; xineramaSupport = true;
xmlSupport = true; xmlSupport = true;
sdlSupport = true;
}; };
full = base.override { full = base.override {