pyrox.dev
Merge pull request #146807 from SFrijters/wine-6.22
wine{Unstable,Staging}: 6.20 -> 6.22
authored by Dmitry Kalinkin and committed by GitHub 49e78bbd a0d4895e
+15
pkgs/misc/emulators/wine/cert-path-6.21.patch
+15
pkgs/misc/emulators/wine/cert-path-6.21.patch
···
1
+
diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
2
+
index 7cb521eb98b..5804b88be84 100644
3
+
--- a/dlls/crypt32/unixlib.c
4
+
+++ b/dlls/crypt32/unixlib.c
5
+
@@ -654,6 +654,10 @@ static void load_root_certs(void)
6
+
7
+
for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
8
+
import_certs_from_path( CRYPT_knownLocations[i], TRUE );
9
+
+
10
+
+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
11
+
+ if (nix_cert_file != NULL)
12
+
+ import_certs_from_path(nix_cert_file, TRUE);
13
+
}
14
+
15
+
static NTSTATUS enum_root_certs( void *args )
+4
-4
pkgs/misc/emulators/wine/sources.nix
+4
-4
pkgs/misc/emulators/wine/sources.nix
···
44
44
45
45
unstable = fetchurl rec {
46
46
# NOTE: Don't forget to change the SHA256 for staging as well.
47
-
version = "6.20";
47
+
version = "6.22";
48
48
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
49
-
sha256 = "0wc4a8slb3k859sdw9wwy92zc4pq7xw1kbq4frnxbzbvkiz26a20";
49
+
sha256 = "sha256-gmBCoYGph5cyo9rLv4FnYF8wUpG/z6r16qDslSXXZO8=";
50
50
inherit (stable) gecko32 gecko64;
51
51
52
52
## see http://wiki.winehq.org/Mono
···
58
58
59
59
patches = [
60
60
# Also look for root certificates at $NIX_SSL_CERT_FILE
61
-
./cert-path.patch
61
+
./cert-path-6.21.patch
62
62
];
63
63
};
64
64
65
65
staging = fetchFromGitHub rec {
66
66
# https://github.com/wine-staging/wine-staging/releases
67
67
inherit (unstable) version;
68
-
sha256 = "12fvfn77rsqwdprkxiylq09jc81lq34bm8p1zhhn85q6yawpjlbn";
68
+
sha256 = "sha256-dGyaos6xITiAQdU65/PJQKRl5Rr5xBpgQhXii9iwb+E=";
69
69
owner = "wine-staging";
70
70
repo = "wine-staging";
71
71
rev = "v${version}";