cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
toybox: unbreak on darwin
This commit is contained in:
Jörg Thalheim 2023-01-16 09:58:26 +01:00 committed by GitHub
commit 2f1948af9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/misc/toybox/default.nix
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;
};

4
pkgs/top-level/all-packages.nix
View file

@ -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 { };