git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #155089 from veprbl/pr/usr-include_remove

darwin.usr-include: remove

commit66ab3568d67b90275c0720aae8b911bad82c24fe authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateSat 29 Jan 2022, 22:36 (5 years ago) parent6b5f025831e799
2 files changed−25
pkgs/os-specific/darwin/usr-include/default.nix−23 pkgs/top-level/darwin-packages.nix−2
pkgs/os-specific/darwin/usr-include/default.nixdeleted−23
@@ -1,23 +0,0 @@
1−{lib, stdenv, darwin}:
2−
3−/*
4− * This is needed to build GCC on Darwin.
5− *
6− * These are the collection of headers that would normally be available under
7− * /usr/include in macOS machines with command line tools installed. They need
8− * to be in one folder for gcc to use them correctly.
9− */
10−
11−stdenv.mkDerivation {
12− name = "darwin-usr-include";
13− buildInputs = [ darwin.CF stdenv.libc ];
14− buildCommand = ''
15− mkdir -p $out
16− cd $out
17− ln -sf ${stdenv.libc}/include/* .
18− mkdir CoreFoundation
19− ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation
20− '';
21−
22− meta.platforms = lib.platforms.darwin;
23−}
pkgs/top-level/darwin-packages.nix−2
@@ -154,8 +154,6 @@ impure-cmds // appleSourcePackages // chooseLibs // {
154154
155155 trash = callPackage ../os-specific/darwin/trash { };
156156
157− usr-include = callPackage ../os-specific/darwin/usr-include { };
158−
159157 xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { };
160158
161159 inherit (pkgs.callPackages ../os-specific/darwin/xcode { })