wineStable: revert cert-path patch for stable
This commit is contained in:
parent
22da5d92af
commit
9144ebaf1e
@ -2,6 +2,7 @@
|
|||||||
name, version, src, mingwGccs, monos, geckos, platforms,
|
name, version, src, mingwGccs, monos, geckos, platforms,
|
||||||
pkgconfig, fontforge, makeWrapper, flex, bison,
|
pkgconfig, fontforge, makeWrapper, flex, bison,
|
||||||
supportFlags,
|
supportFlags,
|
||||||
|
patches,
|
||||||
buildScript ? null, configureFlags ? []
|
buildScript ? null, configureFlags ? []
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -9,6 +10,7 @@ with import ./util.nix { inherit lib; };
|
|||||||
|
|
||||||
let
|
let
|
||||||
vkd3d = callPackage ./vkd3d.nix {};
|
vkd3d = callPackage ./vkd3d.nix {};
|
||||||
|
patches' = patches;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||||
builder = buildScript;
|
builder = buildScript;
|
||||||
@ -73,10 +75,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
|||||||
])
|
])
|
||||||
++ [ pkgs.xorg.libX11 pkgs.perl ]));
|
++ [ pkgs.xorg.libX11 pkgs.perl ]));
|
||||||
|
|
||||||
patches = [
|
patches = [ ] ++ patches';
|
||||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
|
||||||
./cert-path.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
# Wine locates a lot of libraries dynamically through dlopen(). Add
|
# Wine locates a lot of libraries dynamically through dlopen(). Add
|
||||||
# them to the RPATH so that the user doesn't have to set them in
|
# them to the RPATH so that the user doesn't have to set them in
|
||||||
|
24
pkgs/misc/emulators/wine/cert-path-stable.patch
Normal file
24
pkgs/misc/emulators/wine/cert-path-stable.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
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);
|
@ -7,7 +7,7 @@ let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
|
|||||||
in with src; {
|
in with src; {
|
||||||
wine32 = pkgsi686Linux.callPackage ./base.nix {
|
wine32 = pkgsi686Linux.callPackage ./base.nix {
|
||||||
name = "wine-${version}";
|
name = "wine-${version}";
|
||||||
inherit src version supportFlags;
|
inherit src version supportFlags patches;
|
||||||
pkgArches = [ pkgsi686Linux ];
|
pkgArches = [ pkgsi686Linux ];
|
||||||
geckos = [ gecko32 ];
|
geckos = [ gecko32 ];
|
||||||
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
|
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
|
||||||
@ -16,7 +16,7 @@ in with src; {
|
|||||||
};
|
};
|
||||||
wine64 = callPackage ./base.nix {
|
wine64 = callPackage ./base.nix {
|
||||||
name = "wine64-${version}";
|
name = "wine64-${version}";
|
||||||
inherit src version supportFlags;
|
inherit src version supportFlags patches;
|
||||||
pkgArches = [ pkgs ];
|
pkgArches = [ pkgs ];
|
||||||
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
||||||
geckos = [ gecko64 ];
|
geckos = [ gecko64 ];
|
||||||
@ -26,7 +26,7 @@ in with src; {
|
|||||||
};
|
};
|
||||||
wineWow = callPackage ./base.nix {
|
wineWow = callPackage ./base.nix {
|
||||||
name = "wine-wow-${version}";
|
name = "wine-wow-${version}";
|
||||||
inherit src version supportFlags;
|
inherit src version supportFlags patches;
|
||||||
stdenv = stdenv_32bit;
|
stdenv = stdenv_32bit;
|
||||||
pkgArches = [ pkgs pkgsi686Linux ];
|
pkgArches = [ pkgs pkgsi686Linux ];
|
||||||
geckos = [ gecko32 gecko64 ];
|
geckos = [ gecko32 gecko64 ];
|
||||||
|
@ -35,6 +35,11 @@ in rec {
|
|||||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||||
sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l";
|
sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||||
|
./cert-path-stable.patch
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
unstable = fetchurl rec {
|
unstable = fetchurl rec {
|
||||||
|
Loading…
Reference in New Issue
Block a user