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

Merge pull request #155529 from SFrijters/wine-7.0

Browse source 
wineStable: 6.0.2 -> 7.0 / wine{Unstable,Staging}: 7.0-rc6 -> 7.0
This commit is contained in:
Bernardo Meurer 2022-01-23 03:54:45 +00:00 committed by GitHub
parent 56b162cad0 abe5804eff
commit aec48ffcb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 51 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
View file

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

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

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

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

@ -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 = [
@ -42,30 +42,12 @@ in rec {
];
};
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "7.0-rc5";
url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz";
sha256 = "sha256-jQjHneYAZ3H26EXje9cyoduXN7TakiLksDdzNoi3d1g=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "7.0.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA=";
};
patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE
./cert-path-6.21.patch
];
};
unstable = stable;
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-RFwDI8eGw9BikQ8X+S1+EPHKAgNaYHuZOJzmlg12ROI=";
sha256 = "sha256-2gBfsutKG0ok2ISnnAUhJit7H2TLPDpuP5gvfMVE44o=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";