diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2021-09-27 21:54:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 21:54:38 +0000 |
| commit | ed8c752e13ef5a217806556a96b51ca7f7fb1007 (patch) | |
| tree | a59b0538e740e6bc8e245bc47d4572a9df8105cb /pkgs/misc/emulators | |
| parent | abc36451d78d4c36a57a3acc7ce2f08e40789e72 (diff) | |
| parent | ba6a2ecc641312e31983405491b8b4233f2b0b98 (diff) | |
Merge pull request #139653 from Atemu/wine-minimal-without-installers
wine: only embed mono & gecko installers in winePackages.full
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0023d9878b364..46532179edd83 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 6def48b4f5964..023d013740dd4 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; }; }); |