diff options
| author | Stefan Frijters <sfrijters@gmail.com> | 2022-01-18 23:10:20 +0100 |
|---|---|---|
| committer | Stefan Frijters <sfrijters@gmail.com> | 2022-01-18 23:11:11 +0100 |
| commit | ead5bfe3c81f020ecbf15bd83088553d979c6da3 (patch) | |
| tree | 0bf8815c5b34ea1e58b5abf5128ccdcd7e904ace /pkgs/misc/emulators/wine | |
| parent | 7342cdc70156522050ce813386f6e159ca749d82 (diff) | |
| download | nixpkgs-ead5bfe3c81f020ecbf15bd83088553d979c6da3.tar nixpkgs-ead5bfe3c81f020ecbf15bd83088553d979c6da3.tar.gz nixpkgs-ead5bfe3c81f020ecbf15bd83088553d979c6da3.tar.bz2 nixpkgs-ead5bfe3c81f020ecbf15bd83088553d979c6da3.tar.lz nixpkgs-ead5bfe3c81f020ecbf15bd83088553d979c6da3.tar.xz nixpkgs-ead5bfe3c81f020ecbf15bd83088553d979c6da3.tar.zst nixpkgs-ead5bfe3c81f020ecbf15bd83088553d979c6da3.zip | |
wineStable: 6.0.2 -> 7.0
Diffstat (limited to 'pkgs/misc/emulators/wine')
| -rw-r--r-- | pkgs/misc/emulators/wine/cert-path-6.21.patch | 15 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/cert-path.patch | 14 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 12 |
3 files changed, 9 insertions, 32 deletions
diff --git a/pkgs/misc/emulators/wine/cert-path-6.21.patch b/pkgs/misc/emulators/wine/cert-path-6.21.patch deleted file mode 100644 index f0727f422f8..00000000000 --- a/pkgs/misc/emulators/wine/cert-path-6.21.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/cert-path.patch b/pkgs/misc/emulators/wine/cert-path.patch index 18a90e1a9af..f0727f422f8 100644 --- a/pkgs/misc/emulators/wine/cert-path.patch +++ b/pkgs/misc/emulators/wine/cert-path.patch @@ -1,16 +1,8 @@ diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c -index 035f2d936bb..959716d727a 100644 +index 7cb521eb98b..5804b88be84 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c -@@ -24,6 +24,7 @@ - #include "wine/port.h" - - #include <stdarg.h> -+#include <stdlib.h> - #include <dirent.h> - #include <fcntl.h> - #include <unistd.h> -@@ -605,6 +606,10 @@ static void load_root_certs(void) +@@ -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 ); @@ -20,4 +12,4 @@ index 035f2d936bb..959716d727a 100644 + import_certs_from_path(nix_cert_file, TRUE); } - static BOOL WINAPI enum_root_certs( void *buffer, SIZE_T size, SIZE_T *needed ) + static NTSTATUS enum_root_certs( void *args ) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index c0a29739b91..8bbcd842677 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "6.0.2"; - url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-3+PFiseFwHIg4o8VtiKZ12wk0lametm//Yrvpns9u3A="; + version = "7.0"; + url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz"; + sha256 = "sha256-W0PifVwIXLGPlzlORhgDENXu98HZHGiVQyo4ibLeCGs="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -31,9 +31,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "5.1.1"; + version = "7.0.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l"; + sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA="; }; patches = [ @@ -58,7 +58,7 @@ in rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path-6.21.patch + ./cert-path.patch ]; }; |