diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/by-name/pr/profanity/package.nix similarity index 86% rename from pkgs/applications/networking/instant-messengers/profanity/default.nix rename to pkgs/by-name/pr/profanity/package.nix index 117a95f4e476..7f4780fb80ff 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/by-name/pr/profanity/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + config, meson, ninja, cmocka, @@ -18,21 +19,28 @@ pkg-config, readline, sqlite, - autoAwaySupport ? true, + + # Read from config.profanity, falling back to true + autoAwaySupport ? config.profanity.autoAwaySupport or true, libxscrnsaver, libx11, - notifySupport ? true, + + notifySupport ? config.profanity.notifySupport or true, libnotify, gdk-pixbuf, - omemoSupport ? true, + + omemoSupport ? config.profanity.omemoSupport or true, libsignal-protocol-c, libgcrypt, qrencode, - pgpSupport ? true, + + pgpSupport ? config.profanity.pgpSupport or true, gpgme, - pythonPluginSupport ? true, + + pythonPluginSupport ? config.profanity.pythonPluginSupport or true, python3, - traySupport ? true, + + traySupport ? config.profanity.traySupport or true, gtk3, otrSupport ? true, libotr, @@ -48,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-rPiYzG5KvJyKt7b99AImmO6wTYxZPFcf/6Xhz8SrgIo="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 506c38f1bc91..d84b180e0606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9212,14 +9212,6 @@ with pkgs; inherit (pidginPackages) pidgin; - # perhaps there are better apps for this task? It's how I had configured my previous system. - # And I don't want to rewrite all rules - profanity = callPackage ../applications/networking/instant-messengers/profanity ( - { - } - // (config.profanity or { }) - ); - puredata-with-plugins = plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };