From dea8b612186514a574c35c726ff6925af4c09527 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 27 Jun 2025 14:31:48 +0200
Subject: [PATCH 1/2] cdrtools: unpin llvmPackages_14

---
 pkgs/tools/cd-dvd/cdrtools/default.nix | 14 ++++++++++----
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix
index 6ac321e61fc6..1b8e568b1bab 100644
--- a/pkgs/tools/cd-dvd/cdrtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdrtools/default.nix
@@ -22,10 +22,16 @@ stdenv.mkDerivation rec {
     libcap
   ];
 
-  env.CFLAGS = toString [
-    "-Wno-error=implicit-int"
-    "-Wno-error=implicit-function-declaration"
-  ];
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      "-Wno-error=implicit-int"
+      "-Wno-error=implicit-function-declaration"
+    ]
+    # https://github.com/macports/macports-ports/commit/656932616eebe60f4e8cfd96d8268801dad8224d
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      "-DNO_SCANSTACK"
+    ]
+  );
 
   postPatch = ''
     sed "/\.mk3/d" -i libschily/Targets.man
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fe50aec5a33..5df52cad410a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2505,9 +2505,7 @@ with pkgs;
 
   cdist = python3Packages.callPackage ../tools/admin/cdist { };
 
-  cdrtools = callPackage ../tools/cd-dvd/cdrtools {
-    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv;
-  };
+  cdrtools = callPackage ../tools/cd-dvd/cdrtools { };
 
   cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
 

From e46de4648ac3ab96226eff2af82fbed76273910d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 27 Jun 2025 14:32:32 +0200
Subject: [PATCH 2/2] cdrtools: add wegank as maintainer

---
 pkgs/tools/cd-dvd/cdrtools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix
index 1b8e568b1bab..3f61dd45854d 100644
--- a/pkgs/tools/cd-dvd/cdrtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdrtools/default.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
       gpl2Plus
       lgpl21
     ];
+    maintainers = with maintainers; [ wegank ];
     platforms = with platforms; linux ++ darwin;
     # Licensing issues: This package contains code licensed under CDDL, GPL2
     # and LGPL2. There is a debate regarding the legality of distributing this