diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 8136324770e6..23bfb324c1ae 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,16 +36,19 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.0"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-PXLmGwVjHavcKDIxdo+TioVUSyfjH6v+E8V7TfXF47s="; + hash = "sha256-AwSC5bjw9pxr/Upja2+m12tkqeweF58auqNbGrONHhA="; }; + # Why is this needed? https://github.com/weechat/weechat/issues/2031 + patches = lib.optional gettext.gettextNeedsLdflags ./gettext-intl.patch; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ diff --git a/pkgs/applications/networking/irc/weechat/gettext-intl.patch b/pkgs/applications/networking/irc/weechat/gettext-intl.patch new file mode 100644 index 000000000000..7b95472c06fa --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/gettext-intl.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake +index 358734688..ffcbf7ef4 100644 +--- a/cmake/FindGettext.cmake ++++ b/cmake/FindGettext.cmake +@@ -42,6 +42,7 @@ find_path(LIBINTL_INCLUDE + ) + + set(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE}) ++set(CMAKE_REQUIRED_FLAGS "-lintl") + + check_include_files(libintl.h HAVE_LIBINTL_H) +