Skip to content

Fix Windows and GHC/ucrt. #2034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
patch wine to support UNC paths
  • Loading branch information
angerman committed Sep 7, 2023
commit c9b4e47d232b706d2fa8571eec430bd701ecac43
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 18 additions & 7 deletions overlays/wine.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,21 @@
# files from TH code) for GHC built with msvcrt (ghc<9.6).
# This will inevitably replace *any* wine version. Thus this might not really be what we ultimately want.
# Wine 5.4 does not build on macOS so that is not pinned and TH code will probably break.
final: prev: {
winePackages = prev.winePackages // {
minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [] ++ [ ./patches/wine-add-dll-directory.patch ];
});
};
}
final: prev:
prev.lib.optionalAttrs (!prev.stdenv.hostPlatform.isDarwin) {
winePackages = prev.winePackages // {
minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
name = "wine-5.4";
version = "5.4";
src = prev.fetchurl {
url = "https://dl.winehq.org/wine/source/5.x/wine-5.4.tar.xz";
sha256 = "sha256-Sz4rD/pUFfGZVA5gUcKMOXb86R6lv7LPSgmcJXMXBSw=";
};
patches = [] ++ [ ./patches/wine-add-dll-directory.patch ];
# Turning off the tests as there is a problem with the `schedsvc` test.
# With recent nixpkgs both the IDL files generate `_c.c` files with
# `handle_t rpc_handle` and that results in a linker error (duplicate symbols).
configureFlags = oldAttrs.configureFlags or [] ++ ["--disable-tests"];
});
};
}