public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66119 from toon23/profanity-0.7.0

Browse Source 
profanity: 0.6.0 -> 0.7.0
profanity: Add optional omemo support (enabled by default)
This commit is contained in:
Aaron Andersen 2019-08-09 06:13:34 -04:00 committed by GitHub
commit 3f441e1f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/instant-messengers/profanity/default.nix
View File

@ -8,6 +8,7 @@
, traySupport ? true, gnome2 ? null , traySupport ? true, gnome2 ? null
, pgpSupport ? true, gpgme ? null , pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null , pythonPluginSupport ? true, python ? null
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
}: }:
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
@ -15,18 +16,19 @@ assert notifySupport -> libnotify != null && gdk-pixbuf != null;
assert traySupport -> gnome2 != null; assert traySupport -> gnome2 != null;
assert pgpSupport -> gpgme != null; assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null; assert pythonPluginSupport -> python != null;
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "profanity-${version}"; name = "profanity-${version}";
version = "0.6.0"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boothj5"; owner = "profanity-im";
repo = "profanity"; repo = "profanity";
rev = "${version}"; rev = "${version}";
sha256 = "0f5kfzy22wzyj7rnd2nbj93q96ga87b53wlg8lfg83qdphx1ymz9"; sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z";
}; };
patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];
@ -44,14 +46,16 @@ stdenv.mkDerivation rec {
++ optionals notifySupport [ libnotify gdk-pixbuf ] ++ optionals notifySupport [ libnotify gdk-pixbuf ]
++ optionals traySupport [ gnome2.gtk ] ++ optionals traySupport [ gnome2.gtk ]
++ optionals pgpSupport [ gpgme ] ++ 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 # Enable feature flags, so that build fail if libs are missing
configureFlags = [ "--enable-c-plugins" "--enable-otr" ] configureFlags = [ "--enable-c-plugins" "--enable-otr" ]
++ optionals notifySupport [ "--enable-notifications" ] ++ optionals notifySupport [ "--enable-notifications" ]
++ optionals traySupport [ "--enable-icons" ] ++ optionals traySupport [ "--enable-icons" ]
++ optionals pgpSupport [ "--enable-pgp" ] ++ optionals pgpSupport [ "--enable-pgp" ]
++ optionals pythonPluginSupport [ "--enable-python-plugins" ]; ++ optionals pythonPluginSupport [ "--enable-python-plugins" ]
++ optionals omemoSupport [ "--enable-omemo" ];
preAutoreconf = '' preAutoreconf = ''
mkdir m4 mkdir m4