nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-27 22:44:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3993 from wkennington/master.bitlbee

Browse Source 
Update Bitlbee and dependant libraries
This commit is contained in:
Pascal Wittmann 2014-09-07 11:23:12 +02:00
commit c210c0e422
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/instant-messengers/bitlbee/default.nix
View File

@ -1,19 +1,23 @@
{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }: { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bitlbee-3.2"; name = "bitlbee-3.2.2";
src = fetchurl { src = fetchurl {
url = "mirror://bitlbee/src/${name}.tar.gz"; url = "mirror://bitlbee/src/${name}.tar.gz";
sha256 = "1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030"; sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s";
}; };
buildInputs = [ gnutls glib pkgconfig libotr ] buildInputs = [ gnutls glib pkgconfig libotr ]
++ stdenv.lib.optional doCheck check; ++ optional doCheck check;
configureFlags = [ "--otr=1" ]; configureFlaags = [
"--gcov=1"
"--otr=1"
"--ssl=gnutls"
];
preCheck = "mkdir tests/.depend";
doCheck = true; doCheck = true;
meta = { meta = {
@ -31,9 +35,9 @@ stdenv.mkDerivation rec {
''; '';
homepage = http://www.bitlbee.org/; homepage = http://www.bitlbee.org/;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = with maintainers; [ ludo wkennington ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice platforms = platforms.gnu; # arbitrary choice
}; };
} }

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

@ -1,23 +1,22 @@
{stdenv, fetchgit, libgcrypt, autoconf, automake, libtool}: { stdenv, fetchurl, libgcrypt, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libotr-20130821-git-f0f8a2"; name = "libotr-4.0.0";
src = fetchgit {
url = "http://git.code.sf.net/p/otr/libotr"; src = fetchurl {
rev = "f0f8a2"; url = "https://otr.cypherpunks.ca/${name}.tar.gz";
sha256 = "08019r8bnk8f4yx6574jdz217p283ry7dmpqcad2d87yhkdmc3mm"; sha256 = "1d4k0b7v4d3scwm858cmqr9c6xgd6ppla1vk4x2yg64q82a1k49z";
}; };
NIX_LDFLAGS = "-lssp"; buildInputs = [ autoreconfHook ];
propagatedBuildInputs = [ libgcrypt ];
propagatedBuildInputs = [ libgcrypt autoconf automake libtool ]; meta = with stdenv.lib; {
preConfigure = "autoreconf -vfi";
meta = {
homepage = "http://www.cypherpunks.ca/otr/"; homepage = "http://www.cypherpunks.ca/otr/";
repositories.git = git://git.code.sf.net/p/otr/libotr; repositories.git = git://git.code.sf.net/p/otr/libotr;
license = stdenv.lib.licenses.lgpl21; license = licenses.lgpl21;
description = "Library for Off-The-Record Messaging"; description = "Library for Off-The-Record Messaging";
maintainers = with maintainers; [ wkennington ];
platforms = platforms.unix;
}; };
} }

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

@ -8423,10 +8423,7 @@ let
(callPackage ../applications/misc/bitcoin/dogecoin.nix {}) (callPackage ../applications/misc/bitcoin/dogecoin.nix {})
); );
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
gnutls = gnutls;
libotr = libotr_3_2;
};
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
python = python34; python = python34;