alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source
This commit is contained in:
Atemu 2021-09-27 14:08:31 +02:00
parent 51bcdc4cda
commit ba6a2ecc64
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/misc/emulators/wine/base.nix
View file

@ -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)

3
pkgs/misc/emulators/wine/default.nix
View file

@ -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;
};
});

1
pkgs/top-level/wine-packages.nix
View file

@ -47,6 +47,7 @@ rec {
ldapSupport = true;
faudioSupport = true;
vkd3dSupport = true;
embedInstallers = true;
};
stable = base.override { wineRelease = "stable"; };