diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-05-12 11:43:19 +0200 |
|---|---|---|
| committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2018-05-12 20:03:31 +0900 |
| commit | 4320c1151d985dd2ed0fdf6d4cdb4ead91503144 (patch) | |
| tree | 507f64926fdbe39fc4eb06292d0a424ff62e09b9 | |
| parent | c0e48427c68c7e4128f3da2f8cf49ff32bc379b2 (diff) | |
| download | nixlib-4320c1151d985dd2ed0fdf6d4cdb4ead91503144.tar nixlib-4320c1151d985dd2ed0fdf6d4cdb4ead91503144.tar.gz nixlib-4320c1151d985dd2ed0fdf6d4cdb4ead91503144.tar.bz2 nixlib-4320c1151d985dd2ed0fdf6d4cdb4ead91503144.tar.lz nixlib-4320c1151d985dd2ed0fdf6d4cdb4ead91503144.tar.xz nixlib-4320c1151d985dd2ed0fdf6d4cdb4ead91503144.tar.zst nixlib-4320c1151d985dd2ed0fdf6d4cdb4ead91503144.zip | |
nss: removed aarch64 patch
With the update to 3.36 the patch introduced with e96473b is no longer required.
| -rw-r--r-- | pkgs/development/libraries/nss/default.nix | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 840b349035b1..29d6e9a5670a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,13 +1,6 @@ { stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }: 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 { url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; @@ -29,8 +22,6 @@ in stdenv.mkDerivation rec { prePatch = '' xz -d < ${nssPEM} | patch -p1 - '' + stdenv.lib.optionalString stdenv.isAarch64 '' - (cd nss && patch -p1 < ${aarch64Patch}) ''; patches = |