From 2e4ef28b8f310c47cc75854bc93b09dfa4c1937d Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Sat, 26 Oct 2024 04:36:07 +0000
Subject: [PATCH] rehex: fix darwin

add libiconv to fix darwin build and remove now unneeded frameworks
---
 pkgs/applications/editors/rehex/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix             |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix
index f6f1bf2b28b1f..03383ebc5de14 100644
--- a/pkgs/applications/editors/rehex/default.nix
+++ b/pkgs/applications/editors/rehex/default.nix
@@ -13,9 +13,6 @@
 , lua53Packages
 , perlPackages
 , gtk3
-, Carbon
-, Cocoa
-, IOKit
 }:
 
 stdenv.mkDerivation rec {
@@ -35,8 +32,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ botan3 capstone jansson libunistring wxGTK32 ]
     ++ (with lua53Packages; [ lua busted ])
     ++ (with perlPackages; [ perl TemplateToolkit ])
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ];
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];
 
   makeFlags = [
     "prefix=${placeholder "out"}"
@@ -44,6 +40,10 @@ stdenv.mkDerivation rec {
     "CXXSTD=-std=c++20"
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ];
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
+
   enableParallelBuilding = true;
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e9181528f771..78724cafcba98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11489,9 +11489,7 @@ with pkgs;
 
   remarshal = with python3Packages; toPythonApplication remarshal;
 
-  rehex = darwin.apple_sdk_11_0.callPackage ../applications/editors/rehex {
-    inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit;
-  };
+  rehex = darwin.apple_sdk_11_0.callPackage ../applications/editors/rehex { };
 
   rio = callPackage ../applications/terminal-emulators/rio { };