diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/whois')
-rw-r--r-- | nixpkgs/pkgs/tools/networking/whois/clang.patch | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/networking/whois/default.nix | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/networking/whois/clang.patch b/nixpkgs/pkgs/tools/networking/whois/clang.patch new file mode 100644 index 000000000000..3091b9a3eee3 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/whois/clang.patch @@ -0,0 +1,11 @@ +--- 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)) diff --git a/nixpkgs/pkgs/tools/networking/whois/default.nix b/nixpkgs/pkgs/tools/networking/whois/default.nix index 20c6c5e36525..465ab7650137 100644 --- a/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -1,16 +1,20 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.18"; + version = "5.5.19"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - hash = "sha256-KHOKjblyCP1GykQehmxSKf7vP52wRRH6oz9WbE9fbCk="; + hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0="; }; + patches = [ + ./clang.patch + ]; + nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; |