summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2022-12-27 10:35:11 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2022-12-30 10:39:32 +0100
commitf92ee1a512241509786b2467093d3d3216278b6d (patch)
treedaeacfa855cfa8e845bd87b9527873ef0205f7bd
parent60facffaa9e20d6f5355fb6e12471cb748289bad (diff)
john: unbreak on aarch64-darwin
-rw-r--r--pkgs/tools/security/john/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 6b0d6470ff79..8409bd8d2bc3 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch";
sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A=";
})
+ (fetchpatch {
+ name = "improve-apple-clang-pseudo-intrinsics-portability.patch";
+ url = "https://github.com/openwall/john/commit/c9825e688d1fb9fdd8942ceb0a6b4457b0f9f9b4.patch";
+ excludes = [ "doc/*" ];
+ sha256 = "sha256-hgoiz7IgR4f66fMP7bV1F8knJttY8g2Hxyk3QfkTu+g=";
+ })
];
postPatch = ''
@@ -83,7 +89,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/openwall/john/";
maintainers = with maintainers; [ offline matthewbauer ];
platforms = platforms.unix;
- # never built on aarch64-darwin since first introduction in nixpkgs
- broken = stdenv.isDarwin && stdenv.isAarch64;
};
}