JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #49845 from LnL7/darwin-qtbase

Browse Source 
qt5.qtbase: add cf-private on darwin
This commit is contained in:
Daiderd Jordan 2018-11-07 08:24:18 +01:00 committed by GitHub
commit 26cce54d88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -53,6 +53,7 @@ stdenv.mkDerivation {
if stdenv.isDarwin if stdenv.isDarwin
then with darwin.apple_sdk.frameworks; then with darwin.apple_sdk.frameworks;
[ [
# TODO: move to buildInputs, this should not be propagated.
AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth
CoreLocation CoreServices DiskArbitration Foundation OpenGL CoreLocation CoreServices DiskArbitration Foundation OpenGL
darwin.libobjc libiconv darwin.libobjc libiconv
@ -77,6 +78,9 @@ stdenv.mkDerivation {
[ libinput ] [ libinput ]
++ lib.optional withGtk3 gtk3 ++ lib.optional withGtk3 gtk3
) )
++ lib.optional stdenv.isDarwin
# Needed for OBJC_CLASS_$_NSDate symbols.
[ darwin.cf-private ]
++ lib.optional developerBuild gdb ++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups ++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.connector-c ++ lib.optional (mysql != null) mysql.connector-c