toybox: unbreak on darwin

Was also missing iconv which Darwin's libc doesn't include apparently.

We need to use a workaround for https://github.com/NixOS/nixpkgs/issues/210923
here.
This commit is contained in:
Atemu
2023-01-15 13:16:58 +01:00
parent 0f213d0fee
commit 0c9f7eaae0
2 changed files with 7 additions and 4 deletions
+4 -3
View File
@@ -1,6 +1,6 @@
{
stdenv, lib, fetchFromGitHub, which,
buildPackages, libxcrypt,
buildPackages, libxcrypt, libiconv, Libsystem,
enableStatic ? stdenv.hostPlatform.isStatic,
enableMinimal ? false,
extraConfig ? ""
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross
buildInputs = [
libxcrypt
] ++lib.optionals stdenv.isDarwin [
libiconv
Libsystem # This shouldn't be necessary, see https://github.com/NixOS/nixpkgs/issues/210923
] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [
stdenv.cc.libc
stdenv.cc.libc.static
@@ -67,8 +70,6 @@ stdenv.mkDerivation rec {
homepage = "https://landley.net/toybox/";
license = licenses.bsd0;
platforms = with platforms; linux ++ darwin ++ freebsd;
# https://github.com/NixOS/nixpkgs/issues/101229
broken = stdenv.isDarwin;
maintainers = with maintainers; [ hhm ];
priority = 10;
};
+3 -1
View File
@@ -12418,7 +12418,9 @@ with pkgs;
toxvpn = callPackage ../tools/networking/toxvpn { };
toybox = callPackage ../tools/misc/toybox { };
toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox {
inherit (darwin.apple_sdk_11_0) Libsystem;
};
trackma = callPackage ../tools/misc/trackma { };