diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2018-11-24 16:44:20 +0100 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2018-11-29 00:18:46 +0100 |
| commit | ff74da41fd4c6cb5ebb7f127e16912c76a74684e (patch) | |
| tree | 85cc1ec4095e05d9183c9a060daece1a031d2b9f | |
| parent | aa053197deb846e9cfedb6f7e80330efd3e4c54b (diff) | |
| download | nixpkgs-ff74da41fd4c6cb5ebb7f127e16912c76a74684e.tar nixpkgs-ff74da41fd4c6cb5ebb7f127e16912c76a74684e.tar.gz nixpkgs-ff74da41fd4c6cb5ebb7f127e16912c76a74684e.tar.bz2 nixpkgs-ff74da41fd4c6cb5ebb7f127e16912c76a74684e.tar.lz nixpkgs-ff74da41fd4c6cb5ebb7f127e16912c76a74684e.tar.xz nixpkgs-ff74da41fd4c6cb5ebb7f127e16912c76a74684e.tar.zst nixpkgs-ff74da41fd4c6cb5ebb7f127e16912c76a74684e.zip | |
winePackages.wine: add SDL support
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/wine-packages.nix | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index f87f8eab984..94cf4a77456 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -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 ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 91323ab6de7..6ecca6c2503 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -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; }; }); diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 8ff2d46c24e..3a81a3d99bc 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -25,6 +25,7 @@ rec { udevSupport = true; xineramaSupport = true; xmlSupport = true; + sdlSupport = true; }; full = base.override { |