Returned elfutils 0.127 as an option.. I do not see why ltrace fails with 0.131. Will investigate after the merge.

svn path=/nixpkgs/trunk/; revision=10041
This commit is contained in:
Michael Raskin 2008-01-01 15:44:27 +00:00
parent dcec5245e0
commit f75be37d70
3 changed files with 20 additions and 6 deletions

View File

@ -0,0 +1,9 @@
args: with args;
stdenv.mkDerivation {
name = "elfutils-"+version;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz;
sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv";
};
}

View File

@ -1,7 +1,7 @@
{stdenv, fetchurl}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "elfutils-0.131"; name = "elfutils-"+version;
src = fetchurl { src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz; url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz;
sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll"; sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll";

View File

@ -1409,10 +1409,15 @@ rec {
inherit fetchurl stdenv replace; inherit fetchurl stdenv replace;
}; };
elfutils = import ../development/tools/misc/elfutils { elfutilsFun = lib.sumArgs
(selectVersion ../development/tools/misc/elfutils) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
elfutils = elfutilsFun {
version = "0.131";
} null;
epm = import ../development/tools/misc/epm { epm = import ../development/tools/misc/epm {
inherit fetchurl stdenv rpm; inherit fetchurl stdenv rpm;
}; };
@ -1493,8 +1498,8 @@ rec {
}; };
ltrace = import ../development/tools/misc/ltrace { ltrace = import ../development/tools/misc/ltrace {
inherit fetchurl stdenv builderDefs stringsWithDeps lib inherit fetchurl stdenv builderDefs stringsWithDeps lib;
elfutils; elfutils = elfutilsFun {version = "0.127";} null;
}; };
mk = import ../development/tools/build-managers/mk { mk = import ../development/tools/build-managers/mk {