diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-09-23 20:41:50 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-09-23 21:06:09 +0200 |
| commit | db2538fb0cfdb92b3fd4e4204023641825fd4604 (patch) | |
| tree | a4cc75da77ae490d93fb1aaeaf3fba22c00f0cf6 /pkgs | |
| parent | ac775ac6ddba6fb685d5a8ae9f2a74b7f25d7839 (diff) | |
| download | nixlib-db2538fb0cfdb92b3fd4e4204023641825fd4604.tar nixlib-db2538fb0cfdb92b3fd4e4204023641825fd4604.tar.gz nixlib-db2538fb0cfdb92b3fd4e4204023641825fd4604.tar.bz2 nixlib-db2538fb0cfdb92b3fd4e4204023641825fd4604.tar.lz nixlib-db2538fb0cfdb92b3fd4e4204023641825fd4604.tar.xz nixlib-db2538fb0cfdb92b3fd4e4204023641825fd4604.tar.zst nixlib-db2538fb0cfdb92b3fd4e4204023641825fd4604.zip | |
qt5-qtbase: fix darwin build
Fixes #27474
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch | 36 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/qtbase/default.nix | 7 |
2 files changed, 40 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch new file mode 100644 index 000000000000..3e6e0e5101a1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch @@ -0,0 +1,36 @@ +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index 341d3bc..3368234 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); + QString TableGenerator::findComposeFile() +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index 59b7637..b91139d 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -320,7 +320,7 @@ static void qt_closePopups() + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator<NSWindow*> *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index a4451a486ce1..23dab52b80c5 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL - darwin.cf-private darwin.libobjc libiconv + darwin.libobjc libiconv ]); buildInputs = [ ] @@ -79,7 +79,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "bin" ]; patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series); + copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch; postPatch = '' @@ -110,7 +111,7 @@ stdenv.mkDerivation { -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ ./configure sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf - sed -i '26,$d' ./mkspecs/features/mac/default_post.prf + sed -i '27,$d' ./mkspecs/features/mac/default_post.prf sed -i '1,$d' ./mkspecs/features/mac/sdk.prf sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf ''; |