wine: fix build with gcc 15 (#473888)
This commit is contained in:
@@ -82,6 +82,16 @@ let
|
||||
})
|
||||
];
|
||||
|
||||
# Fix build with GCC 15
|
||||
# https://bugs.winehq.org/show_bug.cgi?id=58191
|
||||
patches-add-truncf-to-the-import-library = [
|
||||
(pkgs.fetchpatch {
|
||||
name = "add-truncf-to-the-import-library.patch";
|
||||
url = "https://gitlab.winehq.org/wine/wine/-/commit/ed66bd5c97ecc17c42a4942dafac7d406c1e5120.patch";
|
||||
hash = "sha256-mn0fRZ840MYk1WZsBLcachUzyNmBUSlvf50t9jFGXp0=";
|
||||
})
|
||||
];
|
||||
|
||||
inherit (pkgs) writeShellScript;
|
||||
in
|
||||
rec {
|
||||
@@ -114,7 +124,8 @@ rec {
|
||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||
./cert-path.patch
|
||||
]
|
||||
++ patches-binutils-2_44-fix-wine-older-than-10_2;
|
||||
++ patches-binutils-2_44-fix-wine-older-than-10_2
|
||||
++ patches-add-truncf-to-the-import-library;
|
||||
|
||||
updateScript = writeShellScript "update-wine-stable" ''
|
||||
${updateScriptPreamble}
|
||||
@@ -204,7 +215,8 @@ rec {
|
||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||
./cert-path.patch
|
||||
]
|
||||
++ patches-binutils-2_44-fix-wine-older-than-10_2;
|
||||
++ patches-binutils-2_44-fix-wine-older-than-10_2
|
||||
++ patches-add-truncf-to-the-import-library;
|
||||
|
||||
# see https://gitlab.winehq.org/wine/wine-staging
|
||||
staging = fetchFromGitLab {
|
||||
|
||||
Reference in New Issue
Block a user