pyrox.dev
lol
Merge pull request #187357 from mweinelt/nss-drop-patches
nss: drop multiple patches
-11
pkgs/development/libraries/nss/ckpem.patch
-11
pkgs/development/libraries/nss/ckpem.patch
···
1
-
--- nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:12.000000000 -0800
2
-
+++ nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:20.000000000 -0800
3
-
@@ -156,8 +156,6 @@
4
-
NSS_EXTERN_DATA pemInternalObject nss_pem_data[];
5
-
NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects;
6
-
7
-
- PRBool logged_in;
8
-
-
9
-
/* our raw object data array */
10
-
NSS_EXTERN_DATA pemInternalObject nss_pem_data[];
11
-
NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects;
+9
-24
pkgs/development/libraries/nss/generic.nix
+9
-24
pkgs/development/libraries/nss/generic.nix
···
19
19
}:
20
20
21
21
let
22
-
nssPEM = fetchurl {
23
-
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
24
-
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
25
-
};
26
-
27
22
underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version;
28
23
in
29
24
stdenv.mkDerivation rec {
···
44
39
45
40
propagatedBuildInputs = [ nspr ];
46
41
47
-
prePatch = ''
48
-
# strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_
49
-
xz -d < ${nssPEM} | sed \
50
-
-e 's/-DIRS = builtins $/-DIRS = . builtins/g' \
51
-
-e 's/CKO_NETSCAPE_/CKO_NSS_/g' \
52
-
-e 's/CKT_NETSCAPE_/CKT_NSS_/g' \
53
-
| patch -p1
54
-
55
-
patchShebangs nss
56
-
57
-
for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
58
-
substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
59
-
done
60
-
61
-
substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
62
-
'';
63
-
64
42
patches = [
65
43
# Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
66
44
(if (lib.versionOlder version "3.77") then
···
68
46
else
69
47
./85_security_load_3.77+.patch
70
48
)
71
-
./ckpem.patch
72
49
./fix-cross-compilation.patch
73
50
];
74
51
75
52
patchFlags = [ "-p0" ];
76
53
77
-
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
54
+
postPatch = ''
55
+
patchShebangs nss
56
+
57
+
for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
58
+
substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
59
+
done
60
+
61
+
substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
62
+
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
78
63
substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
79
64
substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
80
65
'';