diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index f6f1bf2b28b1f..e971360b64e36 100644 --- 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,7 +34,7 @@ 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"}" @@ -44,6 +42,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..8d7ce93647e84 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 = callPackage ../applications/editors/rehex { }; rio = callPackage ../applications/terminal-emulators/rio { };