From c27109efa0a8a451d937a85656cfa985fe41ce51 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Aug 2005 07:39:38 +0000 Subject: [PATCH] * Added Valknut. svn path=/nixpkgs/trunk/; revision=3746 --- .../applications/networking/p2p/valknut/builder.sh | 12 ++++++++++++ .../networking/p2p/valknut/default.nix | 14 ++++++++++++++ pkgs/development/libraries/dclib/builder.sh | 10 ++++++++++ pkgs/development/libraries/dclib/default.nix | 13 +++++++++++++ pkgs/system/all-packages-generic.nix | 9 +++++++++ 5 files changed, 58 insertions(+) create mode 100644 pkgs/applications/networking/p2p/valknut/builder.sh create mode 100644 pkgs/applications/networking/p2p/valknut/default.nix create mode 100644 pkgs/development/libraries/dclib/builder.sh create mode 100644 pkgs/development/libraries/dclib/default.nix diff --git a/pkgs/applications/networking/p2p/valknut/builder.sh b/pkgs/applications/networking/p2p/valknut/builder.sh new file mode 100644 index 000000000000..5bf84a308e58 --- /dev/null +++ b/pkgs/applications/networking/p2p/valknut/builder.sh @@ -0,0 +1,12 @@ +addInputsHook=addBzip2 +addBzip2() { + bzip2=$(type -tP bzip2) + test -n $bzip2 || fail + buildInputs="$(dirname $(dirname $bzip2)) $buildInputs" +} + +source $stdenv/setup + +export configureFlags="--with-ssl-dir=$openssl --x-libraries=/no-such-dir" + +genericBuild diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix new file mode 100644 index 000000000000..994f6b44f943 --- /dev/null +++ b/pkgs/applications/networking/p2p/valknut/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt, dclib}: + +stdenv.mkDerivation { + name = "valknut-0.3.7"; + builder = ./builder.sh; + + src = fetchurl { + url = http://download.berlios.de/dcgui/valknut-0.3.7.tar.bz2; + md5 = "848f9b3f25af15c3f1837133ac4b9415"; + }; + + buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt dclib]; + inherit openssl; +} diff --git a/pkgs/development/libraries/dclib/builder.sh b/pkgs/development/libraries/dclib/builder.sh new file mode 100644 index 000000000000..9c6bbf5b1f60 --- /dev/null +++ b/pkgs/development/libraries/dclib/builder.sh @@ -0,0 +1,10 @@ +addInputsHook=addBzip2 +addBzip2() { + bzip2=$(type -tP bzip2) + test -n $bzip2 || fail + buildInputs="$(dirname $(dirname $bzip2)) $buildInputs" +} + +source $stdenv/setup + +genericBuild diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix new file mode 100644 index 000000000000..0cc4f25c48e2 --- /dev/null +++ b/pkgs/development/libraries/dclib/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, libxml2, openssl}: + +stdenv.mkDerivation { + name = "dclib-0.3.7"; + builder = ./builder.sh; + + src = fetchurl { + url = http://download.berlios.de/dcgui/dclib-0.3.7.tar.bz2; + md5 = "d35833414534bcac8ce2c8a62ce903a4"; + }; + + buildInputs = [libxml2 openssl]; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index f6ee80b407fc..060399eb1c89 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -906,6 +906,10 @@ rec { inherit fetchurl stdenv libtool; }; + dclib = (import ../development/libraries/dclib) { + inherit fetchurl stdenv libxml2 openssl; + }; + perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit fetchurl perl db4; }; @@ -1279,6 +1283,11 @@ rec { sslSupport = true; }; + valknut = (import ../applications/networking/p2p/valknut) { + inherit fetchurl stdenv perl x11 libxml2 libjpeg libpng openssl dclib; + qt = qt3; + }; + firefox = (import ../applications/networking/browsers/firefox) { inherit fetchurl stdenv pkgconfig perl zip; inherit (gtkLibs) gtk;