From 63bac2c23ea5dd1e3f96520e41a6ae879fe71a45 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 9 Nov 2017 23:29:41 +0100
Subject: [PATCH] cf-private: overwrite headers from CF

---
 pkgs/os-specific/darwin/cf-private/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix
index f8c25339370b..603c0f652b01 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/pkgs/os-specific/darwin/cf-private/default.nix
@@ -7,12 +7,14 @@ stdenv.mkDerivation {
     dest=$out/Library/Frameworks/CoreFoundation.framework/Headers
     mkdir -p $dest
     pushd $dest
-      cp -Lv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest
       for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do
-        ln -sf $file 
+        ln -sf $file
       done
-    popd
 
+      # Copy or overwrite private headers, some of these might already
+      # exist in CF but the private versions have more information.
+      cp -Lfv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest
+    popd
   '';
 
   setupHook = ./setup-hook.sh;