ba6a2ec · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

wine: only embed mono & gecko installers in winePackages.full

commitba6a2ecc641312e31983405491b8b4233f2b0b98 authorAtemu <atemu.main@gmail.com> dateMon 27 Sep 2021, 14:08 (5 years ago) parent51bcdc4

3 files changed+4−2

unifiedsplit

pkgs/misc/emulators/wine/base.nix+1−1

@@ -106,7 +106,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {

106106

107107 postInstall = let

108108 links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";

109− in ''

109+ in lib.optionalString supportFlags.embedInstallers ''

110110 mkdir -p $out/share/wine/gecko $out/share/wine/mono/

111111 ${lib.strings.concatStringsSep "\n"

112112 ((map (links "share/wine/gecko") geckos)

pkgs/misc/emulators/wine/default.nix+2−1

@@ -45,6 +45,7 @@

4545 faudioSupport ? false,

4646 vkd3dSupport ? false,

4747 mingwSupport ? wineRelease != "stable",

48+ embedInstallers ? false # The Mono and Gecko MSI installers

4849}:

4950

5051let wine-build = build: release:

@@ -57,7 +58,7 @@ let wine-build = build: release:

5758 gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport

5859 pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport

5960 openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport

60− vkd3dSupport mingwSupport;

61+ vkd3dSupport mingwSupport embedInstallers;

6162 };

6263 });

6364

pkgs/top-level/wine-packages.nix+1

@@ -47,6 +47,7 @@ rec {

4747 ldapSupport = true;

4848 faudioSupport = true;

4949 vkd3dSupport = true;

50+ embedInstallers = true;

5051 };

5152

5253 stable = base.override { wineRelease = "stable"; };