diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-01-01 15:44:27 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-01-01 15:44:27 +0000 |
commit | f75be37d703f64202bf093f45be1e20cf948f54e (patch) | |
tree | c0d6ee9e7037e086a3f2832675bcc70c10ee9b2a /pkgs/top-level/all-packages.nix | |
parent | dcec5245e048510fc121eff759191f81c825c25d (diff) | |
download | nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.gz nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.bz2 nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.lz nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.xz nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.zst nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.zip |
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
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac7fef880a5..429a7529706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1409,10 +1409,15 @@ rec { inherit fetchurl stdenv replace; }; - elfutils = import ../development/tools/misc/elfutils { - inherit fetchurl stdenv; + elfutilsFun = lib.sumArgs + (selectVersion ../development/tools/misc/elfutils) { + inherit fetchurl stdenv; }; + elfutils = elfutilsFun { + version = "0.131"; + } null; + epm = import ../development/tools/misc/epm { inherit fetchurl stdenv rpm; }; @@ -1493,8 +1498,8 @@ rec { }; ltrace = import ../development/tools/misc/ltrace { - inherit fetchurl stdenv builderDefs stringsWithDeps lib - elfutils; + inherit fetchurl stdenv builderDefs stringsWithDeps lib; + elfutils = elfutilsFun {version = "0.127";} null; }; mk = import ../development/tools/build-managers/mk { |