summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@higgsboson.tk>2017-02-07 07:51:32 +0100
committerJörg Thalheim <joerg@higgsboson.tk>2017-02-08 20:45:31 +0100
commitb1b0e9f6abfc1c03c0a4b613918611c813ce5c8c (patch)
tree2a0a4d3ccbc38001732ae95740b2f3a8449f647a /pkgs
parentd2465227d52de29cd7bb8a49feb0a1cb21a4bc11 (diff)
downloadnixpkgs-b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c.tar
nixpkgs-b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c.tar.gz
nixpkgs-b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c.tar.bz2
nixpkgs-b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c.tar.lz
nixpkgs-b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c.tar.xz
nixpkgs-b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c.tar.zst
nixpkgs-b1b0e9f6abfc1c03c0a4b613918611c813ce5c8c.zip
dwarfdump: init at 20161124
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libdwarf/default.nix57
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 41 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 48853b63c79..a0e72f2b561 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,30 +1,51 @@
 { stdenv, fetchurl, libelf }:
 
-stdenv.mkDerivation rec {
-  name = "libdwarf-20161124";
-
+let
+  version = "20161124";
   src = fetchurl {
-    url = "http://www.prevanders.net/${name}.tar.gz";
+    url = "http://www.prevanders.net/libdwarf-${version}.tar.gz";
     sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b"
            + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799";
   };
+  meta = {
+    homepage = https://www.prevanders.net/dwarf.html;
+    platforms = stdenv.lib.platforms.linux;
+  };
 
-  configureFlags = [ "--enable-shared" "--disable-nonshared" ];
+in rec {
+  libdwarf = stdenv.mkDerivation rec {
+    name = "libdwarf-${version}";
 
-  preConfigure = ''
-    cd libdwarf
-  '';
-  buildInputs = [ libelf ];
+    configureFlags = [ "--enable-shared" "--disable-nonshared" ];
 
-  installPhase = ''
-    mkdir -p $out/lib $out/include
-    cp libdwarf.so.1 $out/lib
-    ln -s libdwarf.so.1 $out/lib/libdwarf.so
-    cp libdwarf.h dwarf.h $out/include
-  '';
+    preConfigure = ''
+      cd libdwarf
+    '';
+    buildInputs = [ libelf ];
 
-  meta = {
-    homepage = https://www.prevanders.net/dwarf.html;
-    platforms = stdenv.lib.platforms.linux;
+    installPhase = ''
+      mkdir -p $out/lib $out/include
+      cp libdwarf.so.1 $out/lib
+      ln -s libdwarf.so.1 $out/lib/libdwarf.so
+      cp libdwarf.h dwarf.h $out/include
+    '';
+
+    inherit meta src;
+  };
+
+  dwarfdump = stdenv.mkDerivation rec {
+    name = "dwarfdump-${version}";
+
+    preConfigure = ''
+      cd dwarfdump
+    '';
+
+    buildInputs = [ libelf libdwarf ];
+
+    installPhase = ''
+      install -m755 -D dwarfdump $out/bin/dwarfdump
+    '';
+
+    inherit meta src;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a..bcbb2077fc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8014,7 +8014,8 @@ with pkgs;
   libdvdread = callPackage ../development/libraries/libdvdread { };
   libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
 
-  libdwarf = callPackage ../development/libraries/libdwarf { };
+  inherit (callPackage ../development/libraries/libdwarf { })
+    libdwarf dwarfdump;
 
   libeatmydata = callPackage ../development/libraries/libeatmydata { };