Unverified Commit 195726bf authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #260791 from marsam/fix-whois-darwin 

whois: fix build with Clang
parents 9b805ae9 f9114acb

pkgs/tools/networking/whois/clang.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/utils.h

+++ b/utils.h

@@ -15,7 +15,7 @@

 #endif

 

 /* Portability macros */

-#ifdef __GNUC__

+#if defined __GNUC__ && ! defined __clang__

 # define NORETURN __attribute__((noreturn))

 # define MALLOC_FREE __attribute__((malloc(free)))

 # define NONNULL __attribute__((returns_nonnull))

pkgs/tools/networking/whois/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec { 
    hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0=";

  };



  patches = [

    ./clang.patch

  ];



  nativeBuildInputs = [ perl gettext pkg-config ];

  buildInputs = [ libidn2 libiconv ];