mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
adv_cmds: Disable pkill.
pkill isn't building because of some missing headers: - xpc/xpc.h - os/base_private.h - _simple.h They are all available somewhere but not set up correctly in the Darwin stdenv. TODO: add pkill back in!
This commit is contained in:
parent
ebf963ac6c
commit
6c1858a93d
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, xcbuild, xpc }:
|
||||
{ stdenv, fetchurl, xcbuild, libcxx }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "adv_cmds";
|
||||
@ -9,11 +9,12 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace pkill/pkill.c \
|
||||
--replace '#include <xpc/xpc.h>' ""
|
||||
substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
|
||||
--replace "FD201DC214369B4200906237 /* pkill.c in Sources */," ""
|
||||
'';
|
||||
|
||||
buildInputs = [ xcbuild xpc ];
|
||||
buildInputs = [ xcbuild libcxx ];
|
||||
#NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.darwin;
|
||||
|
@ -17378,7 +17378,5 @@ in
|
||||
|
||||
nitrokey-app = callPackage ../tools/security/nitrokey-app { };
|
||||
|
||||
adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {
|
||||
inherit (darwin.apple_sdk.libs) xpc;
|
||||
};
|
||||
adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user