diff options
| author | Atemu <atemu.main@gmail.com> | 2023-01-15 13:16:58 +0100 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2023-01-15 15:43:00 +0100 |
| commit | 0c9f7eaae017b3a2e0071ac7eb53daf2a58de27d (patch) | |
| tree | 8253dbbabf551e724c287c4ace54a41a0f9cb8ba /pkgs/tools/misc/toybox | |
| parent | 0f213d0fee84280d8c3a97f7469b988d6fe5fcdf (diff) | |
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.
Diffstat (limited to 'pkgs/tools/misc/toybox')
| -rw-r--r-- | pkgs/tools/misc/toybox/default.nix | 7 |
1 files changed, 4 insertions, 3 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; }; |