Merge pull request #30366 from Moredread/profanity-options

profanity: enable python and gpg support, parallel builds and enforcement of enabled features

2 files changed, 26 insertions, 9 deletions

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 79fb9b5c7f92..74dc36bc7ac0 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,14 +1,18 @@
 { stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
 , ncurses, libotr, curl, readline, libuuid
 
-, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
-, notifySupport ? false,   libnotify ? null, gdk_pixbuf ? null
-, traySupport ? false,     gnome2 ? null
+, autoAwaySupport ? false,       libXScrnSaver ? null, libX11 ? null
+, notifySupport ? false,         libnotify ? null, gdk_pixbuf ? null
+, traySupport ? false,           gnome2 ? null
+, pgpSupport ? true,            gpgme ? null
+, pythonPluginSupport ? true,   python ? null
 }:
 
-assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
-assert notifySupport   -> libnotify != null && gdk_pixbuf != null;
-assert traySupport     -> gnome2 != null;
+assert autoAwaySupport     -> libXScrnSaver != null && libX11 != null;
+assert notifySupport       -> libnotify != null && gdk_pixbuf != null;
+assert traySupport         -> gnome2 != null;
+assert pgpSupport          -> gpgme != null;
+assert pythonPluginSupport -> python != null;
 
 with stdenv.lib;
 
@@ -21,13 +25,25 @@ stdenv.mkDerivation rec {
     sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
   };
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkgconfig ];
+
   buildInputs = [
     readline libuuid libmesode
     glib openssl expat ncurses libotr curl
-  ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
-    ++ optionals notifySupport   [ libnotify gdk_pixbuf ]
-    ++ optionals traySupport     [ gnome2.gtk ];
+  ] ++ optionals autoAwaySupport     [ libXScrnSaver libX11 ]
+    ++ optionals notifySupport       [ libnotify gdk_pixbuf ]
+    ++ optionals traySupport         [ gnome2.gtk ]
+    ++ optionals pgpSupport          [ gpgme ]
+    ++ optionals pythonPluginSupport [ python ];
+
+  # Enable feature flags, so that build fail if libs are missing
+  configureFlags = [ "--enable-c-plugins" "--enable-otr" ]
+    ++ optionals notifySupport       [ "--enable-notifications" ]
+    ++ optionals traySupport         [ "--enable-icons" ]
+    ++ optionals pgpSupport          [ "--enable-pgp" ]
+    ++ optionals pythonPluginSupport [ "--enable-python-plugins" ];
 
   meta = {
     description = "A console based XMPP client";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd6553cc16d8..db19302aee5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16114,6 +16114,7 @@ with pkgs;
     notifySupport   = config.profanity.notifySupport   or true;
     traySupport     = config.profanity.traySupport     or true;
     autoAwaySupport = config.profanity.autoAwaySupport or true;
+    python = python3;
   };
 
   psi = kde4.callPackage ../applications/networking/instant-messengers/psi { };