From c2dbbe706b8199efbfefb4c835a1c4a572b1ee02 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:37:46 +0800 Subject: [PATCH] wine64Packages: fix mainProgram --- pkgs/applications/emulators/wine/base.nix | 4 ++-- pkgs/applications/emulators/wine/packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index e3875e130a18..a280b9d3e3d6 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -6,7 +6,7 @@ patches, vkd3dArches, moltenvk, - buildScript ? null, configureFlags ? [] + buildScript ? null, configureFlags ? [], mainProgram ? "wine" }: with import ./util.nix { inherit lib; }; @@ -198,6 +198,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; - mainProgram = "wine"; + inherit mainProgram; }; }) diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index c119feb783d3..0af842ffc1b7 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -28,6 +28,7 @@ in with src; { monos = [ mono ]; configureFlags = [ "--enable-win64" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "wine64"; }; wineWow = callPackage ./base.nix { pname = "wine-wow";