diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-10 12:29:08 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-10 12:47:59 +0000 |
| commit | c9774cb6e509938b112fb7cd3a7928e90e4bccb5 (patch) | |
| tree | f0053175ed7383a8cc86a007f76134735cd85021 /pkgs/development/libraries/qt-5 | |
| parent | 7668f680da515eac57a9b9805da5331dcc725428 (diff) | |
| download | nixlib-c9774cb6e509938b112fb7cd3a7928e90e4bccb5.tar nixlib-c9774cb6e509938b112fb7cd3a7928e90e4bccb5.tar.gz nixlib-c9774cb6e509938b112fb7cd3a7928e90e4bccb5.tar.bz2 nixlib-c9774cb6e509938b112fb7cd3a7928e90e4bccb5.tar.lz nixlib-c9774cb6e509938b112fb7cd3a7928e90e4bccb5.tar.xz nixlib-c9774cb6e509938b112fb7cd3a7928e90e4bccb5.tar.zst nixlib-c9774cb6e509938b112fb7cd3a7928e90e4bccb5.zip | |
qt512.qtbase: Fix darwin build
Diffstat (limited to 'pkgs/development/libraries/qt-5')
3 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 2800f2d77978..8d27f3a0d4ba 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -54,6 +54,7 @@ let optionals stdenv.isDarwin [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch ./qtbase.patch.d/0002-qtbase-mac.patch + ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch new file mode 100644 index 000000000000..a43a46d8a69b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm +index a367487e..c3aeca1d 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm +@@ -49,6 +49,11 @@ + // but was only added in the 10.14 SDK, so declare it just in case. + extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); + ++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html ++#if !defined(kIOSurfaceSuccess) ++#define kIOSurfaceSuccess KERN_SUCCESS ++#endif ++ + QT_BEGIN_NAMESPACE + + Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface"); diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index d1ec209c95d0..3dbdb2a9770b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { # TODO: move to buildInputs, this should not be propagated. AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL - darwin.libobjc libiconv MetalKit + darwin.libobjc libiconv MetalKit IOKit ] else [ |