Loading pkgs/tools/networking/whois/clang.patchdeleted 100644 → 0 +0 −11 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 +2 −6 Original line number Diff line number Diff line { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { version = "5.5.19"; version = "5.5.20"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0="; hash = "sha256-0vQ6GBBtNA6Phlqhl3NZvEJqoyZ1um7VdkpsIRKhsm4="; }; patches = [ ./clang.patch ]; nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; Loading Loading
pkgs/tools/networking/whois/clang.patchdeleted 100644 → 0 +0 −11 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 +2 −6 Original line number Diff line number Diff line { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { version = "5.5.19"; version = "5.5.20"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0="; hash = "sha256-0vQ6GBBtNA6Phlqhl3NZvEJqoyZ1um7VdkpsIRKhsm4="; }; patches = [ ./clang.patch ]; nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; Loading