diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index d737b8d9916e..472cc79fd4a4 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,27 +1,11 @@ {stdenv, fetchurl, libgcrypt}: -stdenv.mkDerivation rec { - name = "libotr-4.0.0"; +stdenv.mkDerivation { + name = "libotr-3.2.0"; src = fetchurl { - urls = [ - "http://www.cypherpunks.ca/otr/${name}.tar.gz" - # The site is down at the time of updating to 4.0.0, so I add this url - http://ftp.de.debian.org/debian/pool/main/libo/libotr/libotr_4.0.0.orig.tar.gz - ]; - sha256 = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4"; + url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz; + sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq"; }; - # Crashes without it, still not accepted upstream. - # Discussed in https://github.com/cryptodotis/irssi-otr/issues/21 - patches = [ ./0001-Fix-pass-opdata-when-sending-message-fragment.patch ]; - - NIX_LDFLAGS = "-lssp"; - - propagatedBuildInputs = [ libgcrypt ]; - - meta = { - homepage = "http://www.cypherpunks.ca/otr/"; - license = "LGPLv2.1"; - description = "Library for Off-The-Record Messaging"; - }; + propagatedBuildInputs = [libgcrypt]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0caed27517da..680ee200c849 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4419,6 +4419,8 @@ let libotr = callPackage ../development/libraries/libotr { }; + libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { }; + libp11 = callPackage ../development/libraries/libp11 { }; libpar2 = callPackage ../development/libraries/libpar2 { }; @@ -6633,6 +6635,7 @@ let # For some reason, TLS support is broken when using GnuTLS 3.0 (can't # connect to jabber.org, for instance.) gnutls = gnutls2; + libotr = libotr_3_2; }; blender = callPackage ../applications/misc/blender {