From 0c9f7eaae017b3a2e0071ac7eb53daf2a58de27d Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 15 Jan 2023 13:16:58 +0100
Subject: 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.
---
 pkgs/tools/misc/toybox/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix    | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index c94537c0bfd24..212452001b8cd 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -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;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48097badba56e..3e4e46c015deb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };
 
-- 
cgit 1.4.1