From 831e799e477e0ace7ed0c848dc304b847937db24 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 15 Jan 2022 04:16:21 -0500 Subject: [PATCH] darwin.usr-include: remove Originally introduced in 8610a344 ('gcc: use special native system headers for darwin') as a hack, not used anymore. --- .../darwin/usr-include/default.nix | 23 ------------------- pkgs/top-level/darwin-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/os-specific/darwin/usr-include/default.nix diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix deleted file mode 100644 index 26b60ea44f5..00000000000 --- a/pkgs/os-specific/darwin/usr-include/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, darwin}: - -/* - * This is needed to build GCC on Darwin. - * - * These are the collection of headers that would normally be available under - * /usr/include in macOS machines with command line tools installed. They need - * to be in one folder for gcc to use them correctly. - */ - -stdenv.mkDerivation { - name = "darwin-usr-include"; - buildInputs = [ darwin.CF stdenv.libc ]; - buildCommand = '' - mkdir -p $out - cd $out - ln -sf ${stdenv.libc}/include/* . - mkdir CoreFoundation - ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation - ''; - - meta.platforms = lib.platforms.darwin; -} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 2e031e27307..ff23949ae4f 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -154,8 +154,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { trash = callPackage ../os-specific/darwin/trash { }; - usr-include = callPackage ../os-specific/darwin/usr-include { }; - xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { }; inherit (pkgs.callPackages ../os-specific/darwin/xcode { })