From ba6a2ecc641312e31983405491b8b4233f2b0b98 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 27 Sep 2021 14:08:31 +0200 Subject: [PATCH] wine: only embed mono & gecko installers in winePackages.full --- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/misc/emulators/wine/default.nix | 3 ++- pkgs/top-level/wine-packages.nix | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0023d9878b36..46532179edd8 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { postInstall = let links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}"; - in '' + in lib.optionalString supportFlags.embedInstallers '' mkdir -p $out/share/wine/gecko $out/share/wine/mono/ ${lib.strings.concatStringsSep "\n" ((map (links "share/wine/gecko") geckos) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 6def48b4f596..023d013740dd 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -45,6 +45,7 @@ faudioSupport ? false, vkd3dSupport ? false, mingwSupport ? wineRelease != "stable", + embedInstallers ? false # The Mono and Gecko MSI installers }: let wine-build = build: release: @@ -57,7 +58,7 @@ let wine-build = build: release: gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport - vkd3dSupport mingwSupport; + vkd3dSupport mingwSupport embedInstallers; }; }); diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 923d2b80818a..b26bc361cf5e 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -47,6 +47,7 @@ rec { ldapSupport = true; faudioSupport = true; vkd3dSupport = true; + embedInstallers = true; }; stable = base.override { wineRelease = "stable"; };