b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #112034 from SFrijters/wine6

Browse source 
wine{Unstable,Staging}: 6.0-rc4 -> 6.1 / wineStable: 5.0.3 -> 6.0
This commit is contained in:
Bernardo Meurer 2021-02-06 01:51:16 +00:00 committed by GitHub
parent ef6c06cc28 0ec2ea8c17
commit 1545cce64d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/misc/emulators/wine/cert-path-stable.patch
View file

@ -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);

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

@ -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,15 +38,15 @@ in rec {
patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE
./cert-path-stable.patch
./cert-path.patch
];
};
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.0-rc4";
url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz";
sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU=";
version = "6.1";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk=";
inherit (stable) mono gecko32 gecko64;
patches = [
@ -58,7 +58,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c=";
sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";