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

libotr: adding back libotr 3.2; bitlbee failed without it

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2013-04-15 20:13:49 +02:00
parent 8fee4ad060
commit b628bbda90
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/libraries/libotr/default.nix
View File

@ -1,27 +1,11 @@
{stdenv, fetchurl, libgcrypt}: {stdenv, fetchurl, libgcrypt}:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "libotr-4.0.0"; name = "libotr-3.2.0";
src = fetchurl { src = fetchurl {
urls = [ url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
"http://www.cypherpunks.ca/otr/${name}.tar.gz" sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
# 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";
}; };
# Crashes without it, still not accepted upstream. propagatedBuildInputs = [libgcrypt];
# 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";
};
} }

3
pkgs/top-level/all-packages.nix
View File

@ -4419,6 +4419,8 @@ let
libotr = callPackage ../development/libraries/libotr { }; libotr = callPackage ../development/libraries/libotr { };
libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
libp11 = callPackage ../development/libraries/libp11 { }; libp11 = callPackage ../development/libraries/libp11 { };
libpar2 = callPackage ../development/libraries/libpar2 { }; libpar2 = callPackage ../development/libraries/libpar2 { };
@ -6633,6 +6635,7 @@ let
# For some reason, TLS support is broken when using GnuTLS 3.0 (can't # For some reason, TLS support is broken when using GnuTLS 3.0 (can't
# connect to jabber.org, for instance.) # connect to jabber.org, for instance.)
gnutls = gnutls2; gnutls = gnutls2;
libotr = libotr_3_2;
}; };
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {