From 7f157c0f3350e1f095c0730ad4c6425965870dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Jan 2011 10:48:25 +0000 Subject: [PATCH] Remove the old experimental BitlBee-OTR. svn path=/nixpkgs/trunk/; revision=25420 --- .../bitlbee-otr/default.nix | 38 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 40 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/bitlbee-otr/default.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-otr/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-otr/default.nix deleted file mode 100644 index 972c812b256..00000000000 --- a/pkgs/applications/networking/instant-messengers/bitlbee-otr/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchbzr, gnutls, glib, pkgconfig, libotr, libgcrypt -, libxslt, xmlto, docbook_xsl, docbook_xml_dtd_42, perl }: - -let revision = "369"; in -stdenv.mkDerivation rec { - name = "bitlbee-otr-r${revision}"; - src = fetchbzr { - url = "http://khjk.org/~pesco/bitlbee-otr"; - sha256 = "0fb7987ec4a321e07f22690ed6617db9f377fdf4e65a531d8da28a950817074f"; - inherit revision; - }; - - patchPhase = '' - # Both OTR and GnuTLS depend on libgcrypt, but for some reason, `bitlbee' - # must be explicitly linked against it. - sed -i "configure" -e "s|-f \$""{i}/lib/libotr.a|0 -eq 0|g ; - s|otrprefix=\$""{i}|otrprefix=\"${libotr}\"|g ; - s|-lotr|-lotr -L${libgcrypt} -lgcrypt|g"; - ''; - - buildInputs = [ gnutls glib pkgconfig libotr libgcrypt - libxslt xmlto docbook_xsl docbook_xml_dtd_42 perl - ]; - - meta = { - description = ''BitlBee, an IRC to other chat networks gateway.''; - - longDescription = '' - This unofficial version adds support for communication encryption - and authentication via the OTR (off-the-record) library. - ''; - - # See also http://bugs.bitlbee.org/bitlbee/ticket/115 . - homepage = http://khjk.org/bitlbee-otr/; - - license = "GPL"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34bd056153e..8ca4b33b101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5536,8 +5536,6 @@ let bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; - bitlbeeOtr = callPackage ../applications/networking/instant-messengers/bitlbee-otr { }; - # commented out because it's using the new configuration style proposal which is unstable #biew = import ../applications/misc/biew { # inherit lib stdenv fetchurl ncurses;