diff options
Diffstat (limited to 'pkgs/top-level/wine-packages.nix')
-rw-r--r-- | pkgs/top-level/wine-packages.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index fff2d73110c38..62a2278bd4f13 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,16 +1,13 @@ { stdenv, config, callPackage, wineBuild }: rec { - fonts = callPackage ../misc/emulators/wine/fonts.nix {}; - minimal = callPackage ../misc/emulators/wine { + fonts = callPackage ../applications/emulators/wine/fonts.nix {}; + minimal = callPackage ../applications/emulators/wine { wineRelease = config.wine.release or "stable"; inherit wineBuild; }; base = minimal.override { - pngSupport = true; - jpegSupport = true; - tiffSupport = true; gettextSupport = true; fontconfigSupport = true; alsaSupport = true; @@ -25,7 +22,6 @@ rec { pulseaudioSupport = config.pulseaudio or stdenv.isLinux; udevSupport = true; xineramaSupport = true; - xmlSupport = true; sdlSupport = true; mingwSupport = true; }; @@ -33,8 +29,6 @@ rec { full = base.override { gtkSupport = true; gstreamerSupport = true; - colorManagementSupport = true; - mpg123Support = true; openalSupport = true; openclSupport = true; odbcSupport = true; @@ -42,10 +36,8 @@ rec { vaSupport = true; pcapSupport = true; v4lSupport = true; - gsmSupport = true; gphoto2Support = true; ldapSupport = true; - faudioSupport = true; vkd3dSupport = true; embedInstallers = true; }; @@ -58,4 +50,7 @@ rec { staging = base.override { wineRelease = "staging"; }; stagingFull = full.override { wineRelease = "staging"; }; + + wayland = base.override { wineRelease = "wayland"; }; + waylandFull = full.override { wineRelease = "wayland"; }; } |