libotr: 4.0 back to default. Git problems.

1 files changed, 21 insertions, 5 deletions

diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 472cc79fd4a4..d737b8d9916e 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -1,11 +1,27 @@
 {stdenv, fetchurl, libgcrypt}:
 
-stdenv.mkDerivation {
-  name = "libotr-3.2.0";
+stdenv.mkDerivation rec {
+  name = "libotr-4.0.0";
   src = fetchurl {
-    url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
-    sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
+    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";
   };
 
-  propagatedBuildInputs = [libgcrypt];
+  # 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";
+  };
 }