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

Refactored tapioca-qt closure with using the latest stable release instead of SVN version

Browse Source 
svn path=/nixpkgs/trunk/; revision=14143
This commit is contained in:
Sander van der Burg 2009-02-20 16:18:56 +00:00
parent 2d89fb4fee
commit e685c82812
3 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/tapioca-qt/default.nix
View File

@ -1,16 +1,10 @@
args: with args; {stdenv, fetchurl, cmake, qt4, telepathy_qt}:
let rev = "2066"; in
stdenv.mkDerivation {
name = "tapioca-qt-r${rev}";
src = fetchsvn {
url = "https://tapioca-voip.svn.sourceforge.net/svnroot/tapioca-voip/trunk/tapioca-qt";
inherit rev;
sha256 = "0r2qzlm56yizdi64xga6v2sdhdcgl3cvlsd7g9ynh95813nky88z";
};
buildInputs = [cmake]; stdenv.mkDerivation {
propagatedBuildInputs = [telepathy_qt stdenv.gcc.libc]; name = "tapioca-qt-0.14.1";
meta = { src = fetchurl {
description = "Qt Tapioca binding library"; url = mirror://sourceforge/tapioca-voip/tapioca-qt-0.14.1.tar.gz;
md5 = "169318705af6386057b537c5317d520d";
}; };
buildInputs = [ cmake qt4 telepathy_qt ];
} }

20
pkgs/development/libraries/telepathy-qt/default.nix
View File

@ -1,16 +1,10 @@
args: with args; {stdenv, fetchurl, cmake, qt4}:
let rev = "2031"; in
stdenv.mkDerivation {
name = "telepathy-qt-r${rev}";
src = fetchsvn {
url = "https://tapioca-voip.svn.sourceforge.net/svnroot/tapioca-voip/trunk/telepathy-qt";
inherit rev;
sha256 = "0d7psgc8nr5bryrjgfg92622hbilp0qwx0pya3836bz2l6x3msnb";
};
buildInputs = [cmake]; stdenv.mkDerivation {
propagatedBuildInputs = [qt stdenv.gcc.libc]; name = "telepathy-qt-0.14.1";
meta = { src = fetchurl {
description = "Qt bindings for telepathy"; url = mirror://sourceforge/tapioca-voip/telepathy-qt-0.14.1.tar.gz;
md5 = "476e3fbd68b3eaf5354559be7de99333";
}; };
buildInputs = [ cmake qt4 ];
} }

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

@ -3799,8 +3799,7 @@ let
}; };
tapioca_qt = import ../development/libraries/tapioca-qt { tapioca_qt = import ../development/libraries/tapioca-qt {
inherit fetchsvn stdenv cmake telepathy_qt; inherit stdenv fetchurl cmake qt4 telepathy_qt;
qt = qt4;
}; };
tecla = import ../development/libraries/tecla { tecla = import ../development/libraries/tecla {
@ -3817,8 +3816,7 @@ let
}; };
telepathy_qt = import ../development/libraries/telepathy-qt { telepathy_qt = import ../development/libraries/telepathy-qt {
inherit fetchsvn stdenv cmake; inherit stdenv fetchurl cmake qt4;
qt = qt4;
}; };
tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.4.18") { tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.4.18") {