From b4946f56ae7e9277652239a819afcf800c62ec2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Nied=C5=BAwiedzi=C5=84ski?= Date: Tue, 23 Mar 2021 22:54:02 +0100 Subject: [PATCH 1/2] Use python with dbus --- .../networking/instant-messengers/pidgin/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 65b9c245a38..10233921459 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -29,11 +29,13 @@ let unwrapped = stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; - buildInputs = [ + buildInputs = let + python-with-dbus = python.withPackages (pp: with pp; [ dbus-python ]); + in [ aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr - libXScrnSaver ncurses python + libXScrnSaver ncurses python-with-dbus avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl ] From f3c739f4792eff0fca12c637c3017f431272665e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Mar 2021 17:29:49 +0200 Subject: [PATCH 2/2] pidgin: add checks (see parent commit, too) --- .../networking/instant-messengers/pidgin/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 10233921459..edbc28f793b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -74,6 +74,15 @@ let unwrapped = stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + # In particular, this detects missing python imports in some of the tools. + postInstallCheck = '' + for f in "''${!outputBin}"/bin/{purple-remote,pidgin}; do + echo "Testing: $f --help" + "$f" --help + done + ''; + meta = with lib; { description = "Multi-protocol instant messaging client"; homepage = "http://pidgin.im";