diff options
author | Aman Setia <amansetiarjp@gmail.com> | 2024-01-20 19:18:43 +0000 |
---|---|---|
committer | Stefan Frijters <sfrijters@gmail.com> | 2024-01-20 21:08:49 +0100 |
commit | 00f48620ac28b2fc0bc080f8836dce385aa13bf4 (patch) | |
tree | a078520f6af1e046e987df9fd0e0a0616346ba6e /pkgs/applications/emulators/wine | |
parent | 38f7be8b49aef5a16cf62a3a2d12ae47d45b839a (diff) |
winePackages.*: Enable wayland driver; wine-waylan
..d only add -wayland prefix if wine-wayland package is selected otherwise keep the original name
Diffstat (limited to 'pkgs/applications/emulators/wine')
-rw-r--r-- | pkgs/applications/emulators/wine/base.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/emulators/wine/packages.nix | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 68814ca5ba58e..08bf9a6306824 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -3,6 +3,7 @@ bison, flex, fontforge, makeWrapper, pkg-config, nixosTests, supportFlags, + wineRelease, patches, moltenvk, buildScript ? null, configureFlags ? [], mainProgram ? "wine" @@ -46,7 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { }) // rec { inherit version src; - pname = prevName + lib.optionalString supportFlags.waylandSupport "-wayland"; + pname = prevName + lib.optionalString (wineRelease == "wayland") "-wayland"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 06c2b7486cd23..ec05cef74414d 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -36,7 +36,7 @@ sdlSupport ? false, usbSupport ? false, mingwSupport ? wineRelease != "stable", - waylandSupport ? wineRelease == "wayland", + waylandSupport ? stdenv.isLinux, x11Support ? stdenv.isLinux, embedInstallers ? false, # The Mono and Gecko MSI installers moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index c6744dbdcbc76..b40f92dae81c7 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -8,7 +8,7 @@ let in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { pname = "wine"; - inherit src version supportFlags patches moltenvk; + inherit src version supportFlags patches moltenvk wineRelease; pkgArches = [ pkgsi686Linux ]; geckos = [ gecko32 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; @@ -17,7 +17,7 @@ in with src; { }; wine64 = callPackage ./base.nix { pname = "wine64"; - inherit src version supportFlags patches moltenvk; + inherit src version supportFlags patches moltenvk wineRelease; pkgArches = [ pkgs ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; @@ -28,7 +28,7 @@ in with src; { }; wineWow = callPackage ./base.nix { pname = "wine-wow"; - inherit src version supportFlags patches moltenvk; + inherit src version supportFlags patches moltenvk wineRelease; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; geckos = [ gecko32 gecko64 ]; @@ -44,7 +44,7 @@ in with src; { }; wineWow64 = callPackage ./base.nix { pname = "wine-wow64"; - inherit src version patches moltenvk; + inherit src version patches moltenvk wineRelease; supportFlags = supportFlags // { mingwSupport = true; }; # Required because we request "--enable-archs=x86_64" pkgArches = [ pkgs ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; |