cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #146807 from SFrijters/wine-6.22

Browse source 
wine{Unstable,Staging}: 6.20 -> 6.22
This commit is contained in:
Dmitry Kalinkin 2021-11-20 20:22:03 -05:00 committed by GitHub
commit 49e78bbd2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/misc/emulators/wine/cert-path-6.21.patch Normal file
View 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 )

8
pkgs/misc/emulators/wine/sources.nix
View file

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec { unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well. # NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.20"; version = "6.22";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "0wc4a8slb3k859sdw9wwy92zc4pq7xw1kbq4frnxbzbvkiz26a20"; sha256 = "sha256-gmBCoYGph5cyo9rLv4FnYF8wUpG/z6r16qDslSXXZO8=";
inherit (stable) gecko32 gecko64; inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono ## see http://wiki.winehq.org/Mono
@ -58,14 +58,14 @@ in rec {
patches = [ patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE # Also look for root certificates at $NIX_SSL_CERT_FILE
./cert-path.patch ./cert-path-6.21.patch
]; ];
}; };
staging = fetchFromGitHub rec { staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases # https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version; inherit (unstable) version;
sha256 = "12fvfn77rsqwdprkxiylq09jc81lq34bm8p1zhhn85q6yawpjlbn"; sha256 = "sha256-dGyaos6xITiAQdU65/PJQKRl5Rr5xBpgQhXii9iwb+E=";
owner = "wine-staging"; owner = "wine-staging";
repo = "wine-staging"; repo = "wine-staging";
rev = "v${version}"; rev = "v${version}";