From d443e89d25ee30fc84c935907fff79d165530501 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 19 Jun 2025 09:08:14 -0700
Subject: [PATCH] libdwarf: 0.11.1 -> 2.0.0

---
 pkgs/by-name/li/libdwarf/common.nix  | 41 -------------------------
 pkgs/by-name/li/libdwarf/package.nix | 46 +++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/by-name/li/libdwarf/common.nix

diff --git a/pkgs/by-name/li/libdwarf/common.nix b/pkgs/by-name/li/libdwarf/common.nix
deleted file mode 100644
index 39abf711bbb0..000000000000
--- a/pkgs/by-name/li/libdwarf/common.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  buildInputs,
-  hash,
-  version,
-  url,
-  knownVulnerabilities,
-}:
-
-stdenv.mkDerivation {
-  pname = "libdwarf";
-  inherit version;
-
-  src = fetchurl {
-    inherit url hash;
-  };
-
-  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 ];
-    inherit knownVulnerabilities;
-  };
-}
diff --git a/pkgs/by-name/li/libdwarf/package.nix b/pkgs/by-name/li/libdwarf/package.nix
index 539940259b58..9c61445ee549 100644
--- a/pkgs/by-name/li/libdwarf/package.nix
+++ b/pkgs/by-name/li/libdwarf/package.nix
@@ -1,16 +1,48 @@
 {
-  callPackage,
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
   zlib,
   zstd,
 }:
 
-callPackage ./common.nix rec {
-  version = "0.11.1";
-  url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
-  hash = "sha512:d927b1d0e8dd1540c2f5da2a9d39b2914bb48225b2b9bdca94e7b36349358e1f537044eadc345f11d75de717fdda07ad99a8a7a5eb45e64fe4c79c37e165012f";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libdwarf";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "davea42";
+    repo = "libdwarf-code";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SsFg+7zGBEGxDSzfiIP5bxdttlBkhEiEQWaU12hINas=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
   buildInputs = [
     zlib
     zstd
   ];
-  knownVulnerabilities = [ ];
-}
+
+  outputs = [
+    "bin"
+    "lib"
+    "dev"
+    "out"
+  ];
+
+  meta = {
+    description = "Library for reading DWARF2 and later DWARF";
+    mainProgram = "dwarfdump";
+    homepage = "https://github.com/davea42/libdwarf-code";
+    changelog = "https://github.com/davea42/libdwarf-code/releases/tag/v${finalAttrs.version}/CHANGELOG.md";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.atry ];
+  };
+})