tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
wineStable: revert cert-path patch for stable
Alexander V. Nikolaev
5 years ago
9144ebaf
22da5d92
+35
-7
4 changed files
expand all
collapse all
unified
split
pkgs
misc
emulators
wine
base.nix
cert-path-stable.patch
packages.nix
sources.nix
+3
-4
pkgs/misc/emulators/wine/base.nix
···
2
2
name, version, src, mingwGccs, monos, geckos, platforms,
3
3
pkgconfig, fontforge, makeWrapper, flex, bison,
4
4
supportFlags,
5
5
+
patches,
5
6
buildScript ? null, configureFlags ? []
6
7
}:
7
8
···
9
10
10
11
let
11
12
vkd3d = callPackage ./vkd3d.nix {};
13
13
+
patches' = patches;
12
14
in
13
15
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
14
16
builder = buildScript;
···
73
75
])
74
76
++ [ pkgs.xorg.libX11 pkgs.perl ]));
75
77
76
76
-
patches = [
77
77
-
# Also look for root certificates at $NIX_SSL_CERT_FILE
78
78
-
./cert-path.patch
79
79
-
];
78
78
+
patches = [ ] ++ patches';
80
79
81
80
# Wine locates a lot of libraries dynamically through dlopen(). Add
82
81
# them to the RPATH so that the user doesn't have to set them in
+24
pkgs/misc/emulators/wine/cert-path-stable.patch
···
1
1
+
diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
2
2
+
index f795181..fb4926a 100644
3
3
+
--- a/dlls/crypt32/rootstore.c
4
4
+
+++ b/dlls/crypt32/rootstore.c
5
5
+
@@ -18,6 +18,7 @@
6
6
+
#include "config.h"
7
7
+
#include <stdarg.h>
8
8
+
#include <stdio.h>
9
9
+
+#include <stdlib.h> /* getenv */
10
10
+
#include <sys/types.h>
11
11
+
#ifdef HAVE_SYS_STAT_H
12
12
+
#include <sys/stat.h>
13
13
+
@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store)
14
14
+
15
15
+
for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++)
16
16
+
ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE);
17
17
+
+
18
18
+
+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
19
19
+
+ if (nix_cert_file != NULL)
20
20
+
+ ret = import_certs_from_path(nix_cert_file, from, TRUE);
21
21
+
+
22
22
+
check_and_store_certs(from, store);
23
23
+
}
24
24
+
CertCloseStore(from, 0);
+3
-3
pkgs/misc/emulators/wine/packages.nix
···
7
7
in with src; {
8
8
wine32 = pkgsi686Linux.callPackage ./base.nix {
9
9
name = "wine-${version}";
10
10
-
inherit src version supportFlags;
10
10
+
inherit src version supportFlags patches;
11
11
pkgArches = [ pkgsi686Linux ];
12
12
geckos = [ gecko32 ];
13
13
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
···
16
16
};
17
17
wine64 = callPackage ./base.nix {
18
18
name = "wine64-${version}";
19
19
-
inherit src version supportFlags;
19
19
+
inherit src version supportFlags patches;
20
20
pkgArches = [ pkgs ];
21
21
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
22
22
geckos = [ gecko64 ];
···
26
26
};
27
27
wineWow = callPackage ./base.nix {
28
28
name = "wine-wow-${version}";
29
29
-
inherit src version supportFlags;
29
29
+
inherit src version supportFlags patches;
30
30
stdenv = stdenv_32bit;
31
31
pkgArches = [ pkgs pkgsi686Linux ];
32
32
geckos = [ gecko32 gecko64 ];
+5
pkgs/misc/emulators/wine/sources.nix
···
35
35
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
36
36
sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l";
37
37
};
38
38
+
39
39
+
patches = [
40
40
+
# Also look for root certificates at $NIX_SSL_CERT_FILE
41
41
+
./cert-path-stable.patch
42
42
+
];
38
43
};
39
44
40
45
unstable = fetchurl rec {