Merge pull request #139653 from Atemu/wine-minimal-without-installers
wine: only embed mono & gecko installers in winePackages.full
This commit is contained in:
commit
ed8c752e13
3 changed files with 4 additions and 2 deletions
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -47,6 +47,7 @@ rec {
|
|||
ldapSupport = true;
|
||||
faudioSupport = true;
|
||||
vkd3dSupport = true;
|
||||
embedInstallers = true;
|
||||
};
|
||||
|
||||
stable = base.override { wineRelease = "stable"; };
|
||||
|
|
Loading…
Reference in a new issue