diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-11-20 20:22:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 20:22:03 -0500 |
| commit | 49e78bbd2a623974bb039b8493b79e5b6747fb35 (patch) | |
| tree | 1671801184dd384546d8d231447fd84e2bc7b671 /pkgs | |
| parent | a0d4895e9da3fd6a79a3ad0f75750ce87b134807 (diff) | |
| parent | 70e9780f978a80fd5f9d041ad3172b2525f788f7 (diff) | |
Merge pull request #146807 from SFrijters/wine-6.22
wine{Unstable,Staging}: 6.20 -> 6.22
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/emulators/wine/cert-path-6.21.patch | 15 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/wine/cert-path-6.21.patch b/pkgs/misc/emulators/wine/cert-path-6.21.patch new file mode 100644 index 000000000000..f0727f422f8c --- /dev/null +++ b/pkgs/misc/emulators/wine/cert-path-6.21.patch @@ -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 ) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 647185c8b9ba..df50f068cf22 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -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.22"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "0wc4a8slb3k859sdw9wwy92zc4pq7xw1kbq4frnxbzbvkiz26a20"; + sha256 = "sha256-gmBCoYGph5cyo9rLv4FnYF8wUpG/z6r16qDslSXXZO8="; 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-dGyaos6xITiAQdU65/PJQKRl5Rr5xBpgQhXii9iwb+E="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; |