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

qt5.qtwebengine: refactor more things to use patches instead of substituteInPlace

Browse Source 
qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)
This commit is contained in:
Dmitry Kalinkin
2019-03-26 16:30:58 -04:00
parent 1809832958
commit ccd1bf610d
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
-14
View File
@@ -70,20 +70,6 @@ qtModule {
substituteInPlace src/core/config/mac_osx.pri \
--replace /usr ${stdenv.cc}
''
# TODO remove when new Apple SDK is in
+ (if lib.versionOlder qtCompatVersion "5.11" then ''
substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \
--replace "NSArray<NSString*>*" "NSArray*"
substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \
--replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \
--replace "NSArray<VNRequest*>*" "NSArray*" \
--replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
'' else ''
substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \
--replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*"
substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \
--replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*"
'')
+ ''
cat <<EOF > src/3rdparty/chromium/build/mac/find_sdk.py