libdwarf: 20181024 -> 20210528 (#174977)

pkgs/development/libraries/libdwarf/0.4.nix

@@ -1,24 +1,7 @@
-{ lib, stdenv, fetchurl, zlib }:
-
-stdenv.mkDerivation rec {
-  pname = "libdwarf";
+{ callPackage, zlib }:
+callPackage ./common.nix rec {
   version = "0.4.0";
-
-  src = fetchurl {
-    url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
-    sha512 = "30e5c6c1fc95aa28a014007a45199160e1d9ba870b196d6f98e6dd21a349e9bb31bba1bd6817f8ef9a89303bed0562182a7d46fcbb36aedded76c2f1e0052e1e";
-  };
-
-  configureFlags = [ "--enable-shared" "--disable-nonshared" ];
-
+  url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
+  sha512 = "30e5c6c1fc95aa28a014007a45199160e1d9ba870b196d6f98e6dd21a349e9bb31bba1bd6817f8ef9a89303bed0562182a7d46fcbb36aedded76c2f1e0052e1e";
   buildInputs = [ zlib ];
-
-  outputs = [ "bin" "lib" "dev" "out" ];
-
-  meta = {
-    homepage = "https://github.com/davea42/libdwarf-code";
-    platforms = lib.platforms.unix;
-    license = lib.licenses.lgpl21Plus;
-    maintainers = [ lib.maintainers.atry ];
-  };
 }

pkgs/development/libraries/libdwarf/common.nix

@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url }:
+
+stdenv.mkDerivation rec {
+  pname = "libdwarf";
+  inherit version;
+
+  src = fetchurl {
+    inherit url sha512;
+  };
+
+  configureFlags = [ "--enable-shared" "--disable-nonshared" ];
+
+  inherit buildInputs;
+
+  outputs = [ "bin" "lib" "dev" "out" ];
+
+  meta = {
+    homepage = "https://github.com/davea42/libdwarf-code";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.atry ];
+  };
+}

pkgs/development/libraries/libdwarf/default.nix

@@ -1,56 +1,7 @@
-{ lib, stdenv, fetchurl, libelf, zlib }:
-
-let
-  version = "20181024";
-  src = fetchurl {
-    url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
-    # Upstream displays this hash broken into three parts:
-    sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595"
-           + "6d643921a173e6f9e0a184db7aef66f0fd2548d669"
-           + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58";
-  };
-  meta = {
-    homepage = "https://www.prevanders.net/dwarf.html";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.lgpl21Plus;
-  };
-
-in rec {
-  libdwarf = stdenv.mkDerivation {
-    pname = "libdwarf";
-    inherit version;
-
-    configureFlags = [ "--enable-shared" "--disable-nonshared" ];
-
-    preConfigure = ''
-      cd libdwarf
-    '';
-    buildInputs = [ libelf zlib ];
-
-    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 {
-    pname = "dwarfdump";
-    inherit version;
-
-    preConfigure = ''
-      cd dwarfdump
-    '';
-
-    buildInputs = [ libelf libdwarf ];
-
-    installPhase = ''
-      install -m755 -D dwarfdump $out/bin/dwarfdump
-    '';
-
-    inherit meta src;
-  };
+{ callPackage, zlib, libelf }:
+callPackage ./common.nix rec {
+  version = "20210528";
+  url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
+  sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
+  buildInputs = [ zlib libelf ];
 }

pkgs/top-level/all-packages.nix

@@ -18447,8 +18447,8 @@ with pkgs;
   libdvdread = callPackage ../development/libraries/libdvdread { };
   libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
 
-  inherit (callPackage ../development/libraries/libdwarf { })
-    libdwarf dwarfdump;
+  libdwarf = callPackage ../development/libraries/libdwarf { };
+  dwarfdump = libdwarf.bin;
   libdwarf_0_4 = callPackage ../development/libraries/libdwarf/0.4.nix { };
 
   libe57format = callPackage ../development/libraries/libe57format { };