From 9046e54f6da793f19874b7ffe2cf767539702f56 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 6 Apr 2017 21:00:28 -0400 Subject: [PATCH] qt5: fix to work on LLVM 4 (this is reapplying 6b1957d17ae687f7db09db63667fa6f2cc40990b, which got lost in a merge) Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8 and above, since you end up with bad headers in the wrong place that hurt the new libc++ in 3.8 and above. In this case, qt only wanted the super- generic SDK for CUPS headers, which we can just depend on directly now. --- pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix index 0af6ed8b594..be35032785d 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation { AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL - darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv + darwin.cf-private darwin.libobjc libiconv ]); buildInputs = [ ]