From f87e85c2a8eedf735023a923e4050cbf11b1216a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 15 Mar 2008 06:11:45 +0000 Subject: [PATCH] Added LinuxDC++. Claimed to support newer protocol - claim is by valknut team.. svn path=/nixpkgs/trunk/; revision=11132 --- .../misc/kiwixbuilder/default.nix | 28 +++++++++++++++++ .../networking/p2p/ldcpp/1.0.1.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 17 ++++++++++ 3 files changed, 76 insertions(+) create mode 100644 pkgs/applications/misc/kiwixbuilder/default.nix create mode 100644 pkgs/applications/networking/p2p/ldcpp/1.0.1.nix diff --git a/pkgs/applications/misc/kiwixbuilder/default.nix b/pkgs/applications/misc/kiwixbuilder/default.nix new file mode 100644 index 000000000000..cf10ca58c4bc --- /dev/null +++ b/pkgs/applications/misc/kiwixbuilder/default.nix @@ -0,0 +1,28 @@ +args : with args; with builderDefs {src="";} null; + let localDefs = builderDefs (rec { + src = /* put a fetchurl here */ + fetchurl { + url = http://downloads.sourceforge.net/kiwix/kiwixbuilder.tgz; + sha256 = "0qb97smw4675i3hh328a7f65payw1w71bn4d32ycdkmqk56zl4ds"; + }; + buildInputs = [glib zlib]; + configureFlags = [" --prefix=$out "]; + preConfigure = FullDepEntry ('' + export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ ' + export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 ' + sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure + '') ["minInit" "doUnpack"]; + }) args null; /* null is a terminator for sumArgs */ + in with localDefs; +stdenv.mkDerivation rec { + name = "kiwix"; + builder = writeScript (name + "-builder") + (textClosure localDefs + [preConfigure doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + Offline Wikipedia viewer builder. +"; + inherit src; + }; +} diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix new file mode 100644 index 000000000000..ea1f6b1b84b2 --- /dev/null +++ b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix @@ -0,0 +1,31 @@ +args : with args; with builderDefs {src="";} null; + let localDefs = builderDefs (rec { + src = /* put a fetchurl here */ + fetchurl { + url = http://download2.berlios.de/linuxdcpp/linuxdcpp-1.0.1.tar.bz2; + sha256 = "0f0vvsa3x3nirqnf2lagpmbbj3pgdcp6wa2gvadj294b3va4hx34"; + }; + + buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade + openssl libX11]; + configureFlags = []; + doScons = FullDepEntry ('' + ensureDir $out + export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; + scons PREFIX=$out + scons PREFIX=$out install + '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; + }) args null; /* null is a terminator for sumArgs */ + in with localDefs; +stdenv.mkDerivation rec { + name = "ldcpp-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs + [doScons doForceShare doPropagate]); + meta = { + description = " + Linux DC++ - Direct Connect client +"; + inherit src; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 713a68d174de..2a375b413b17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5105,6 +5105,14 @@ rec { # inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder; }; + /*kiwixBuilderFun = lib.sumArgs (import ../applications/misc/kiwixbuilder) { + inherit builderDefs; + inherit (gnome) glib; + zlib = zlibStatic; + }; + + kiwixBuilder = kiwixBuilderFun null;*/ + kuickshow = import ../applications/graphics/kuickshow { inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl; inherit (xlibs) libX11 libXext libSM; @@ -5123,6 +5131,15 @@ rec { inherit fetchurl stdenv builderDefs stringsWithDeps fftw ladspaH pkgconfig; }; + ldcppFun = lib.sumArgs (selectVersion ../applications/networking/p2p/ldcpp "1.0.1") { + inherit builderDefs scons pkgconfig bzip2 openssl; + inherit (gtkLibs) gtk; + inherit (gnome) libglade; + inherit (xlibs) libX11; + }; + + ldcpp = ldcppFun null; + links = import ../applications/networking/browsers/links { inherit fetchurl stdenv; };