Unverified Commit 2f1948af authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

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

toybox: unbreak on darwin
parents 7003e5af 0c9f7eaa

pkgs/tools/misc/toybox/default.nix

+4 −3
Original line number Diff line number Diff line 
{

  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;

  };

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -12452,7 +12452,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 { };