JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #261174 from ncfavier/weechat

Browse Source 
weechat: 4.0.5 -> 4.1.0
This commit is contained in:
Naïm Favier 2023-10-24 11:30:17 +02:00 committed by GitHub
commit 187acf4524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -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; [

12
pkgs/applications/networking/irc/weechat/gettext-intl.patch Normal file
View File

@ -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)