4 files changed, 22 insertions, 28 deletions
diff --git a/pkgs/development/tools/misc/elfutils/0.127.nix b/pkgs/development/tools/misc/elfutils/0.127.nix
deleted file mode 100644
index 3d6f650290b..00000000000
--- a/pkgs/development/tools/misc/elfutils/0.127.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "elfutils-"+version;
-  src = fetchurl {
-    url = http://nixos.org/tarballs/elfutils-0.127.tar.gz;
-    sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv";
-  };
-  preBuild = "sed -e 's/-Werror//' -i */Makefile ";
-  dontAddDisableDepTrack = "true";
-}
diff --git a/pkgs/development/tools/misc/elfutils/0.131.nix b/pkgs/development/tools/misc/elfutils/0.131.nix
deleted file mode 100644
index f2ba07ba007..00000000000
--- a/pkgs/development/tools/misc/elfutils/0.131.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "elfutils-"+version;
-  src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz;
-    sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll";
-  };
-  dontAddDisableDepTrack = "true";
-  preBuild = "sed -e 's/-Werror//' -i */Makefile ";
-}
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
new file mode 100644
index 00000000000..c4098b47e97
--- /dev/null
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, m4}:
+
+stdenv.mkDerivation rec {
+  name = "elfutils-0.140";
+  
+  src = fetchurl {
+    url = "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2";
+    sha256 = "5479c0a0b50b4a370a2baa0f8e906e7e51c403ce3afe3a4cbc6aea7c34eebffd";
+  };
+
+  buildInputs = [m4];
+  
+  dontAddDisableDepTrack = true;
+
+  meta = {
+    homepage = https://fedorahosted.org/elfutils/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1e3b8403b3..4c024367ed6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2281,10 +2281,9 @@ let
     qt = if getPkgConfig "doxygen" "qt3" true then qt3 else null;
   };
 
-  elfutils = composedArgsAndFun
-    (selectVersion ../development/tools/misc/elfutils "0.131") {
-      inherit fetchurl stdenv;
-    };
+  elfutils = import ../development/tools/misc/elfutils {
+    inherit fetchurl stdenv m4;
+  };
 
   epm = import ../development/tools/misc/epm {
     inherit fetchurl stdenv rpm;
@@ -2423,8 +2422,7 @@ let
   };
 
   ltrace = composedArgsAndFun (selectVersion ../development/tools/misc/ltrace "0.5-3deb") {
-    inherit fetchurl stdenv builderDefs stringsWithDeps lib;
-    elfutils = elfutils.passthru.function {version = "0.127";};
+    inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils;
   };
 
   mk = import ../development/tools/build-managers/mk {