Merge pull request #210894 from Atemu/toybox-darwin-unbreak

toybox: unbreak on darwin

authored by Jörg Thalheim and committed by GitHub 2f1948af 7003e5af

+7 -4
+4 -3
pkgs/tools/misc/toybox/default.nix
··· 1 1 { 2 2 stdenv, lib, fetchFromGitHub, which, 3 - buildPackages, libxcrypt, 3 + buildPackages, libxcrypt, libiconv, Libsystem, 4 4 enableStatic ? stdenv.hostPlatform.isStatic, 5 5 enableMinimal ? false, 6 6 extraConfig ? "" ··· 20 20 depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross 21 21 buildInputs = [ 22 22 libxcrypt 23 + ] ++lib.optionals stdenv.isDarwin [ 24 + libiconv 25 + Libsystem # This shouldn't be necessary, see https://github.com/NixOS/nixpkgs/issues/210923 23 26 ] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [ 24 27 stdenv.cc.libc 25 28 stdenv.cc.libc.static ··· 67 70 homepage = "https://landley.net/toybox/"; 68 71 license = licenses.bsd0; 69 72 platforms = with platforms; linux ++ darwin ++ freebsd; 70 - # https://github.com/NixOS/nixpkgs/issues/101229 71 - broken = stdenv.isDarwin; 72 73 maintainers = with maintainers; [ hhm ]; 73 74 priority = 10; 74 75 };
+3 -1
pkgs/top-level/all-packages.nix
··· 12452 12452 12453 12453 toxvpn = callPackage ../tools/networking/toxvpn { }; 12454 12454 12455 - toybox = callPackage ../tools/misc/toybox { }; 12455 + toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { 12456 + inherit (darwin.apple_sdk_11_0) Libsystem; 12457 + }; 12456 12458 12457 12459 trackma = callPackage ../tools/misc/trackma { }; 12458 12460