diff options
author | Ryan Burns <rtburns@protonmail.com> | 2021-11-18 17:44:45 -0800 |
---|---|---|
committer | Ryan Burns <rtburns@protonmail.com> | 2021-11-18 17:51:49 -0800 |
commit | 2d2d47227398480259d1d117c6bb974ce5a49f56 (patch) | |
tree | 48924fdde45b6e0b338a96eb760b9b97a5e3ded1 /pkgs/tools/security/rhash/default.nix | |
parent | c83cfc58e584b2a84fe6e7668620214d40e256f5 (diff) |
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.
Diffstat (limited to 'pkgs/tools/security/rhash/default.nix')
-rw-r--r-- | pkgs/tools/security/rhash/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 205a9b25841e5..7177b1891f2dd 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 |