diff options
| author | Stefan Frijters <sfrijters@gmail.com> | 2021-02-05 13:46:40 +0100 |
|---|---|---|
| committer | Stefan Frijters <sfrijters@gmail.com> | 2021-02-05 14:01:50 +0100 |
| commit | c93866be97d434fb27b677b348ccead134c1d9b2 (patch) | |
| tree | 81106b1ea8a76e0a3c822b0b7f1d216c9d189765 /pkgs/misc/emulators | |
| parent | da97c80fd78f0b5b6a9c27fb98888d6e3d82aace (diff) | |
| download | nixlib-c93866be97d434fb27b677b348ccead134c1d9b2.tar nixlib-c93866be97d434fb27b677b348ccead134c1d9b2.tar.gz nixlib-c93866be97d434fb27b677b348ccead134c1d9b2.tar.bz2 nixlib-c93866be97d434fb27b677b348ccead134c1d9b2.tar.lz nixlib-c93866be97d434fb27b677b348ccead134c1d9b2.tar.xz nixlib-c93866be97d434fb27b677b348ccead134c1d9b2.tar.zst nixlib-c93866be97d434fb27b677b348ccead134c1d9b2.zip | |
wineStaging: 5.0.3 -> 6.0
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/cert-path-stable.patch | 24 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 8 |
2 files changed, 4 insertions, 28 deletions
diff --git a/pkgs/misc/emulators/wine/cert-path-stable.patch b/pkgs/misc/emulators/wine/cert-path-stable.patch deleted file mode 100644 index da01a4778102..000000000000 --- a/pkgs/misc/emulators/wine/cert-path-stable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" - #include <stdarg.h> - #include <stdio.h> -+#include <stdlib.h> /* getenv */ - #include <sys/types.h> - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) - - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); -+ -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); -+ - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 60d138355d6c..49444463ebc9 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 = "5.0.3"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; + version = "6.0"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -38,7 +38,7 @@ in rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path-stable.patch + ./cert-path.patch ]; }; |