dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

rehex: fix darwin

Browse Source 
add libiconv to fix darwin build and remove now unneeded frameworks
This commit is contained in:
Reno Dakota 2024-10-26 04:36:07 +00:00
parent 193adc7e11
commit 358f74f65d
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/rehex/default.nix
View File

@ -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; {

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };