diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-13 09:46:03 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-13 09:46:03 +0200 |
| commit | 4aee94629dce852c6021f5ae8ce60de0508d7e37 (patch) | |
| tree | 22b3f1398f6b0d6203baeddc86181eac89190d1f /pkgs/development/libraries/qt-5/5.12 | |
| parent | ec7f569211091282410050e89e68832d4fe60528 (diff) | |
| parent | 54065ae20d6c91cab54aa706d6e819baf673b80c (diff) | |
| download | nixpkgs-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar nixpkgs-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.gz nixpkgs-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.bz2 nixpkgs-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.lz nixpkgs-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.xz nixpkgs-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.zst nixpkgs-4aee94629dce852c6021f5ae8ce60de0508d7e37.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.12')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch index 364330169bf..546e753144d 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -19,3 +19,15 @@ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf } } else { skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" |