diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-08-11 22:26:55 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-08-11 22:26:55 +0000 |
| commit | 259d0dd9eefd702f226156f01ea915e689a963c4 (patch) | |
| tree | 81979b4550e802969ea88a34a8b6b98692360a75 /pkgs/development/libraries/dclib | |
| parent | 38ee36175780aa8862af95aae280d0d235e8375e (diff) | |
* Gnome 2.14.3.
* GTK updates. * Removed the bzip2 hack. svn path=/nixpkgs/trunk/; revision=6104
Diffstat (limited to 'pkgs/development/libraries/dclib')
| -rw-r--r-- | pkgs/development/libraries/dclib/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/dclib/default.nix | 5 |
2 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/libraries/dclib/builder.sh b/pkgs/development/libraries/dclib/builder.sh deleted file mode 100644 index 9c6bbf5b1f600..0000000000000 --- a/pkgs/development/libraries/dclib/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -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 index a0cd9660d7ca7..17fa74fa6a541 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchurl, libxml2, openssl}: +{stdenv, fetchurl, libxml2, openssl, bzip2}: stdenv.mkDerivation { name = "dclib-0.3.7"; - builder = ./builder.sh; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/dclib-0.3.7.tar.bz2; md5 = "d35833414534bcac8ce2c8a62ce903a4"; }; - buildInputs = [libxml2 openssl]; + buildInputs = [libxml2 openssl bzip2]; } |