From 2d2d47227398480259d1d117c6bb974ce5a49f56 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 18 Nov 2021 17:44:45 -0800 Subject: [PATCH] rhash: fix build on darwin Clang requires upstream patch to fix configure script We're in crunch time for the 21.11 release and this causes lots of rebuilds, so the patch is applied conditionally to give Hydra a break. After it gets auto-merged into staging, I'll do a followup PR to make it unconditional. --- pkgs/tools/security/rhash/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 205a9b25841e..7177b1891f2d 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , which , enableStatic ? stdenv.hostPlatform.isStatic }: @@ -16,6 +17,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-HkDgWwHoRWCNtWyfP4sj3veEd+KT5J7yL4J4Z/hJcrE="; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fix clang configuration; remove with next release + (fetchpatch { + url = "https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc.patch"; + sha256 = "0i5jz2s37h278c8d36pzphhp8rjy660zmhpg2cqlp960f6ny8wwj"; + }) + ]; + nativeBuildInputs = [ which ]; # configure script is not autotools-based, doesn't support these options