wine: allow building with experimental wow64 mode
Allows running 32-bit applications on 64-bit native Wine, with no 32-bit libs on the system. Works at least well enough to run pkgsCross.mingw32.hello.
This commit is contained in:
parent
e426af54ff
commit
51e69b6caf
2 changed files with 12 additions and 0 deletions
|
@ -42,4 +42,15 @@ in with src; {
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
mainProgram = "wine64";
|
mainProgram = "wine64";
|
||||||
};
|
};
|
||||||
|
wineWow64 = callPackage ./base.nix {
|
||||||
|
pname = "wine-wow64";
|
||||||
|
inherit src version supportFlags patches moltenvk;
|
||||||
|
pkgArches = [ pkgs ];
|
||||||
|
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
|
||||||
|
geckos = [ gecko64 ];
|
||||||
|
monos = [ mono ];
|
||||||
|
configureFlags = [ "--enable-archs=x86_64,i386" ];
|
||||||
|
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||||
|
mainProgram = "wine";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -40414,6 +40414,7 @@ with pkgs;
|
||||||
winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
|
winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
|
||||||
wine64Packages = recurseIntoAttrs (winePackagesFor "wine64");
|
wine64Packages = recurseIntoAttrs (winePackagesFor "wine64");
|
||||||
wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow");
|
wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow");
|
||||||
|
wineWow64Packages = recurseIntoAttrs (winePackagesFor "wineWow64");
|
||||||
|
|
||||||
wine = winePackages.full;
|
wine = winePackages.full;
|
||||||
wine64 = wine64Packages.full;
|
wine64 = wine64Packages.full;
|
||||||
|
|
Loading…
Reference in a new issue