From 5b88dba016f08dcb0da17fd4020667338a273e6c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 8 Sep 2025 19:18:08 +0200 Subject: [PATCH 1/2] weechat: use `versionCheckHook` --- pkgs/applications/networking/irc/weechat/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index d4fb001d7887..cb71425182cd 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -38,6 +38,7 @@ libargon2, extraBuildInputs ? [ ], writeScript, + versionCheckHook, }: let @@ -172,10 +173,8 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; - - installCheckPhase = '' - $out/bin/weechat --version - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; passthru.updateScript = writeScript "update-weechat" '' #!/usr/bin/env nix-shell From 61bb8888596bd9a60240f0c7ef29ecfbe1437134 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 8 Sep 2025 21:33:40 +0200 Subject: [PATCH 2/2] weechat: replace `systemd` with `systemdLibs` --- pkgs/applications/networking/irc/weechat/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index cb71425182cd..3cea1541e636 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -32,7 +32,7 @@ tcl, phpSupport ? !stdenv.hostPlatform.isDarwin, php, - systemd, + systemdLibs, libxml2, pcre2, libargon2, @@ -94,7 +94,7 @@ let pcre2 libargon2 ] - ++ lib.optional stdenv.hostPlatform.isLinux systemd; + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemdLibs ]; } ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; @@ -113,7 +113,9 @@ stdenv.mkDerivation rec { }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 - patches = lib.optional gettext.gettextNeedsLdflags ./gettext-intl.patch; + patches = lib.optionals gettext.gettextNeedsLdflags [ + ./gettext-intl.patch + ]; outputs = [ "out" @@ -137,7 +139,7 @@ stdenv.mkDerivation rec { pkg-config asciidoctor ] - ++ lib.optional enableTests cpputest; + ++ lib.optionals enableTests [ cpputest ]; buildInputs = [ ncurses