rehex: fix darwin (#351339)

NixOS · Oct 26, 2024 · 9fb8bd5 · 9fb8bd5
2 parents 664ea60 + 358f74f
commit 9fb8bd5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix
@@ -13,9 +13,7 @@
 , lua53Packages
 , perlPackages
 , gtk3
-, Carbon
-, Cocoa
-, IOKit
+, apple-sdk_11
 }:
 
 stdenv.mkDerivation rec {
@@ -36,14 +34,18 @@ stdenv.mkDerivation rec {
     ++ (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.isDarwin [ apple-sdk_11 ];
 
   makeFlags = [
     "prefix=${placeholder "out"}"
     "BOTAN_PKG=botan-3"
     "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
@@ -11485,9 +11485,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 = callPackage ../applications/editors/rehex { };
 
   rio = callPackage ../applications/terminal-emulators/rio { };