public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nss: removed aarch64 patch

Browse Source 
With the update to 3.36 the patch introduced with e96473b is no longer
required.
This commit is contained in:
Andreas Rammhold
2018-05-12 20:03:31 +09:00
committed by taku0
parent c0e48427c6
commit 4320c1151d
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/nss/default.nix
-9
View File
@@ -1,13 +1,6 @@
{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }: { stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }:
let let
# Fix aarch64 build, shouldn't be needed after 3.35
aarch64Patch = fetchurl {
url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b;
sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq";
};
nssPEM = fetchurl { nssPEM = fetchurl {
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
@@ -29,8 +22,6 @@ in stdenv.mkDerivation rec {
prePatch = '' prePatch = ''
xz -d < ${nssPEM} | patch -p1 xz -d < ${nssPEM} | patch -p1
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
(cd nss && patch -p1 < ${aarch64Patch})
''; '';
patches = patches =