wine{Unstable,Staging}: 6.20 -> 6.21
Upstream dlls/crypt32/unixlib.c has been heavily modified, so we need a new patch that fits for unstable/staging.
This commit is contained in:
parent
1d26590ed3
commit
d127765898
2 changed files with 19 additions and 4 deletions
15
pkgs/misc/emulators/wine/cert-path-6.21.patch
Normal file
15
pkgs/misc/emulators/wine/cert-path-6.21.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
|
||||
index 7cb521eb98b..5804b88be84 100644
|
||||
--- a/dlls/crypt32/unixlib.c
|
||||
+++ b/dlls/crypt32/unixlib.c
|
||||
@@ -654,6 +654,10 @@ static void load_root_certs(void)
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
|
||||
import_certs_from_path( CRYPT_knownLocations[i], TRUE );
|
||||
+
|
||||
+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
|
||||
+ if (nix_cert_file != NULL)
|
||||
+ import_certs_from_path(nix_cert_file, TRUE);
|
||||
}
|
||||
|
||||
static NTSTATUS enum_root_certs( void *args )
|
|
@ -44,9 +44,9 @@ in rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "6.20";
|
||||
version = "6.21";
|
||||
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
|
||||
sha256 = "0wc4a8slb3k859sdw9wwy92zc4pq7xw1kbq4frnxbzbvkiz26a20";
|
||||
sha256 = "sha256-97Z1crUqcVDz3MQzGLQM8QQlFxMZ7fY2imAnRkLgec4=";
|
||||
inherit (stable) gecko32 gecko64;
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
|
@ -58,14 +58,14 @@ in rec {
|
|||
|
||||
patches = [
|
||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||
./cert-path.patch
|
||||
./cert-path-6.21.patch
|
||||
];
|
||||
};
|
||||
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "12fvfn77rsqwdprkxiylq09jc81lq34bm8p1zhhn85q6yawpjlbn";
|
||||
sha256 = "sha256-bgtl/pei/tWob0/voRd1THBnIfsXiu/fmldG2v3rdEE=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
Loading…
Reference in a new issue