diff options
author | Ivan Babrou <github@ivan.computer> | 2021-02-05 23:00:44 -0800 |
---|---|---|
committer | Andrew Childs <lorne@cons.org.nz> | 2021-05-17 00:27:03 +0900 |
commit | da3ae0231aa2433f6f3711e57020456dc27e26e5 (patch) | |
tree | 217cdbffc0dec866e36f39d77c231800cf5e5e5c | |
parent | 2eb97f2ddd3f557c39437c1007b92d51f619628d (diff) | |
download | nixpkgs-da3ae0231aa2433f6f3711e57020456dc27e26e5.tar nixpkgs-da3ae0231aa2433f6f3711e57020456dc27e26e5.tar.gz nixpkgs-da3ae0231aa2433f6f3711e57020456dc27e26e5.tar.bz2 nixpkgs-da3ae0231aa2433f6f3711e57020456dc27e26e5.tar.lz nixpkgs-da3ae0231aa2433f6f3711e57020456dc27e26e5.tar.xz nixpkgs-da3ae0231aa2433f6f3711e57020456dc27e26e5.tar.zst nixpkgs-da3ae0231aa2433f6f3711e57020456dc27e26e5.zip |
apple-source-releases: make it compile on aarch64
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 34d093b7cc0..d42d142ef6e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,5 +1,5 @@ { stdenv, appleDerivation, lib -, Librpcsvc, apple_sdk, pam, CF, openbsm }: +, libutil, Librpcsvc, apple_sdk, pam, CF, openbsm }: appleDerivation { # xcbuild fails with: @@ -7,7 +7,7 @@ appleDerivation { # see issue facebook/xcbuild#188 # buildInputs = [ xcbuild ]; - buildInputs = [ Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF + buildInputs = [ libutil Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF apple_sdk.frameworks.IOKit openbsm ]; # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" @@ -35,6 +35,11 @@ appleDerivation { --replace bsm/audit_session.h bsm/audit.h substituteInPlace login.tproj/login_audit.c \ --replace bsm/audit_session.h bsm/audit.h + '' + lib.optionalString stdenv.isAarch64 '' + substituteInPlace sysctl.tproj/sysctl.c \ + --replace "GPROF_STATE" "0" + substituteInPlace login.tproj/login.c \ + --replace "defined(__arm__)" "defined(__arm__) || defined(__arm64__)" ''; buildPhase = '' |