diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2016-11-07 16:09:10 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-11-15 18:58:09 -0600 |
commit | 6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8 (patch) | |
tree | 8d77c12b7adf5842dd8f712430a43d5df64bed1c /pkgs/os-specific/darwin/apple-source-releases/adv_cmds | |
parent | ebf963ac6cf7b5661cbca21631787211f2bc828f (diff) | |
download | nixlib-6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8.tar nixlib-6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8.tar.gz nixlib-6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8.tar.bz2 nixlib-6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8.tar.lz nixlib-6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8.tar.xz nixlib-6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8.tar.zst nixlib-6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8.zip |
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!
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases/adv_cmds')
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index ca041dfa4003..f9e8207d8bfa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -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; |