Skip to content

Commit

Permalink
qt5: fix to work on LLVM 4
Browse files Browse the repository at this point in the history
(this is reapplying 6b1957d, 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.
  • Loading branch information
copumpkin committed Apr 25, 2017
1 parent a502e32 commit 9046e54
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
Expand Up @@ -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 = [ ]
Expand Down

2 comments on commit 9046e54

@copumpkin
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@periklis
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copumpkin Thx a lot :) It seems good for me.

Please sign in to comment.