From d8c5a5de27af1efab38eedc5dc899b53e1291cc7 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 01:40:00 +0800
Subject: [PATCH] orbuculum: 2.1.0 -> 2.2.0

Diff: https://github.com/orbcode/orbuculum/compare/V2.1.0...V2.2.0

Changelog: https://github.com/orbcode/orbuculum/blob/V2.2.0/CHANGES.md
---
 pkgs/by-name/or/orbuculum/package.nix | 35 ++++++++++++++++++---------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/or/orbuculum/package.nix b/pkgs/by-name/or/orbuculum/package.nix
index 00c54c260a1a..53265eb820cc 100644
--- a/pkgs/by-name/or/orbuculum/package.nix
+++ b/pkgs/by-name/or/orbuculum/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchzip,
   meson,
   ninja,
   pkg-config,
@@ -9,22 +10,33 @@
   libusb1,
   ncurses,
   SDL2,
+  libelf,
 }:
 
-stdenv.mkDerivation rec {
+let
+  libdwarf = fetchzip {
+    url = "https://www.prevanders.net/libdwarf-0.7.0.tar.xz";
+    hash = "sha256-YTTbBJkDu2BSAVpvucqtg7/hFxXrxLnNAlvAL7rmkdE=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "orbuculum";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "orbcode";
     repo = "orbuculum";
-    rev = "V${version}";
-    sha256 = "sha256-Ohcc8739W/EmDjOYhcMgzEPVhzbWrUYgsPLdy4qzxhY=";
+    tag = "V${finalAttrs.version}";
+    hash = "sha256-n3+cfeN6G9n8pD5WyiHPENMJ0FN+bRVZe9pl81uvIrc=";
   };
 
-  prePatch = ''
-    substituteInPlace meson.build --replace \
-      "/etc/udev/rules.d" "$out/etc/udev/rules.d"
+  postPatch = ''
+    cp --recursive --no-preserve=mode ${libdwarf} subprojects/libdwarf-0.7.0
+    pushd subprojects/libdwarf-0.7.0
+    patch -p1 < ../packagefiles/libdwarf/0001-fix-Use-project_source_root-for-subproject-compatibi.patch
+    patch -p1 < ../packagefiles/libdwarf/0002-fix-compilation-clang.patch
+    patch -p1 < ../packagefiles/libdwarf/0003-Fixed-calloc-arguments-order.patch
+    popd
   '';
 
   nativeBuildInputs = [
@@ -38,11 +50,10 @@ stdenv.mkDerivation rec {
     libusb1
     ncurses
     SDL2
+    libelf
   ];
 
-  installFlags = [
-    "INSTALL_ROOT=$(out)/"
-  ];
+  installFlags = [ "INSTALL_ROOT=$(out)/" ];
 
   postInstall = ''
     mkdir -p $out/etc/udev/rules.d/
@@ -52,9 +63,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Cortex M SWO SWV Demux and Postprocess for the ORBTrace";
     homepage = "https://orbcode.org";
-    changelog = "https://github.com/orbcode/orbuculum/blob/V${version}/CHANGES.md";
+    changelog = "https://github.com/orbcode/orbuculum/blob/V${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ newam ];
     platforms = lib.platforms.linux;
   };
-}
+})