diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-08-09 06:13:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 06:13:34 -0400 |
| commit | 3f441e1f65a6937387b023f48109475bebdded1e (patch) | |
| tree | bcae7e4ea76aa880c4d4ec75249c2f448e091c19 /pkgs/applications/networking/instant-messengers | |
| parent | 6446e7e7ace0974fed29f44beec5da3852775523 (diff) | |
| parent | 4640287f318727f5f864226e5c21d22f453ed554 (diff) | |
Merge pull request #66119 from toon23/profanity-0.7.0
profanity: 0.6.0 -> 0.7.0 profanity: Add optional omemo support (enabled by default)
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/profanity/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index fbbf62049715c..79a197d1a7ac0 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -8,6 +8,7 @@ , traySupport ? true, gnome2 ? null , pgpSupport ? true, gpgme ? null , pythonPluginSupport ? true, python ? null +, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; @@ -15,18 +16,19 @@ assert notifySupport -> libnotify != null && gdk-pixbuf != null; assert traySupport -> gnome2 != null; assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; +assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; with stdenv.lib; stdenv.mkDerivation rec { name = "profanity-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { - owner = "boothj5"; + owner = "profanity-im"; repo = "profanity"; rev = "${version}"; - sha256 = "0f5kfzy22wzyj7rnd2nbj93q96ga87b53wlg8lfg83qdphx1ymz9"; + sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z"; }; patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; @@ -44,14 +46,16 @@ stdenv.mkDerivation rec { ++ optionals notifySupport [ libnotify gdk-pixbuf ] ++ optionals traySupport [ gnome2.gtk ] ++ optionals pgpSupport [ gpgme ] - ++ optionals pythonPluginSupport [ python ]; + ++ optionals pythonPluginSupport [ python ] + ++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ]; # 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" ]; + ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] + ++ optionals omemoSupport [ "--enable-omemo" ]; preAutoreconf = '' mkdir m4 |