diff options
author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-12-02 13:53:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-02 13:53:21 +0100 |
commit | 96e1220813888f8870de6c3f323db4435f38e849 (patch) | |
tree | 50057c4fd643a1e8eebcb4f50507f5f739ba2ed0 | |
parent | 19fd547a7fee2665ba562933cc385a5fbe0f63a9 (diff) | |
parent | 8c9582ca673f581dcb3e564f58c4c0a71d0b4e78 (diff) | |
download | nixlib-96e1220813888f8870de6c3f323db4435f38e849.tar nixlib-96e1220813888f8870de6c3f323db4435f38e849.tar.gz nixlib-96e1220813888f8870de6c3f323db4435f38e849.tar.bz2 nixlib-96e1220813888f8870de6c3f323db4435f38e849.tar.lz nixlib-96e1220813888f8870de6c3f323db4435f38e849.tar.xz nixlib-96e1220813888f8870de6c3f323db4435f38e849.tar.zst nixlib-96e1220813888f8870de6c3f323db4435f38e849.zip |
Merge pull request #20857 from Mic92/gajim
gajim: add enableOmemoPluginDependencies option
-rw-r--r-- | pkgs/applications/networking/instant-messengers/gajim/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index e03b99aa1718..11e2b13653d8 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -7,6 +7,7 @@ , enableRST ? true , enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false +, enableOmemoPluginDependencies ? false , extraPythonPackages ? pkgs: [] }: @@ -68,7 +69,9 @@ stdenv.mkDerivation rec { ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils ++ optional enableNotifications pythonPackages.notify - ++ extraPythonPackages pythonPackages; + ++ optionals enableOmemoPluginDependencies (with pythonPackages; [ + cryptography python-axolotl python-axolotl-curve25519 qrcode + ]) ++ extraPythonPackages pythonPackages; postFixup = '' install -m 644 -t "$out/share/gajim/icons/hicolor" \ |