From 6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 16:09:10 -0600 Subject: [PATCH] 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! --- .../darwin/apple-source-releases/adv_cmds/xcode.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 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 ca041dfa400..f9e8207d8bf 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 ' "" + 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf91489c892..ddee4d24e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; }