diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-07 08:24:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 08:24:18 +0100 |
| commit | 26cce54d88ff439a6141cbbdc8c1db8c21284b2a (patch) | |
| tree | c56d8ed5d05f56386c58acf656552c72e6bf7c83 /pkgs | |
| parent | 50602de85e3da378e6ccc449a2a75bc5b5da7d9b (diff) | |
| parent | 9a1a872b4a2244e05b7f2705bd090953746bcdab (diff) | |
| download | nixlib-26cce54d88ff439a6141cbbdc8c1db8c21284b2a.tar nixlib-26cce54d88ff439a6141cbbdc8c1db8c21284b2a.tar.gz nixlib-26cce54d88ff439a6141cbbdc8c1db8c21284b2a.tar.bz2 nixlib-26cce54d88ff439a6141cbbdc8c1db8c21284b2a.tar.lz nixlib-26cce54d88ff439a6141cbbdc8c1db8c21284b2a.tar.xz nixlib-26cce54d88ff439a6141cbbdc8c1db8c21284b2a.tar.zst nixlib-26cce54d88ff439a6141cbbdc8c1db8c21284b2a.zip | |
Merge pull request #49845 from LnL7/darwin-qtbase
qt5.qtbase: add cf-private on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0d9cb81afda9..b8511533a799 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation { if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ + # TODO: move to buildInputs, this should not be propagated. AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL darwin.libobjc libiconv @@ -77,6 +78,9 @@ stdenv.mkDerivation { [ libinput ] ++ lib.optional withGtk3 gtk3 ) + ++ lib.optional stdenv.isDarwin + # Needed for OBJC_CLASS_$_NSDate symbols. + [ darwin.cf-private ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.connector-c |