Merge pull request #317450 from K900/qt-5.15.14
qt5: 5.15.12 -> 5.15.14, 5.15.16 -> 5.15.17
This commit is contained in:
K900
GitHub
commit
1e2373c22a
@ -173,22 +173,6 @@ let
|
||||
})
|
||||
];
|
||||
qtwebengine = [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a6f16c6daea3b5a1f7bc9f175d1645922c131563/qt5/qt5-webengine-python3.patch";
|
||||
hash = "sha256-rUSDwTucXVP3Obdck7LRTeKZ+JYQSNhQ7+W31uHZ9yM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-chromium-python3.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/3rdparty/";
|
||||
hash = "sha256-MZGYeMdGzwypfKoSUaa56K3inbcGRx7he/+AFyk5ekA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-gcc12.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/3rdparty/";
|
||||
hash = "sha256-s4GsGMJTBNWw2gTJuIEP3tqT82AmTsR2mbj59m2p6rM=";
|
||||
})
|
||||
./qtwebengine-link-pulseaudio.patch
|
||||
# Fixes Chromium build failure with Ninja 1.12.
|
||||
# See: https://bugreports.qt.io/browse/QTBUG-124375
|
||||
@ -324,11 +308,6 @@ let
|
||||
in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
|
||||
inherit (srcs.qtwebengine) version;
|
||||
python = python3;
|
||||
postPatch = ''
|
||||
# update catapult for python3 compatibility
|
||||
rm -r src/3rdparty/chromium/third_party/catapult
|
||||
cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult
|
||||
'';
|
||||
inherit (darwin) cctools xnu;
|
||||
inherit (darwin.apple_sdk_11_0) libpm libunwind;
|
||||
inherit (darwin.apple_sdk_11_0.libs) sandbox;
|
||||
|
||||
@ -1,202 +1,202 @@
|
||||
{
|
||||
"qt3d": {
|
||||
"url": "https://invent.kde.org/qt/qt/qt3d.git",
|
||||
"rev": "e1b1a0d2970fd384bd52c734a72536d8452ad070",
|
||||
"sha256": "14q7xf6n8giz5v1s23ndibiv4d6g0ds4v88bx5v984319qxyvpqh"
|
||||
"rev": "9bf4d03e2515f7c454647d54542330b6e90f8191",
|
||||
"sha256": "1w1lq332q270vld7sz0xqpa0f7mvi5gizycfsx9zz9c73qy4idlp"
|
||||
},
|
||||
"qtactiveqt": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
|
||||
"rev": "4fc1cba4c415d84a5879da29f7c459b70fbc15e9",
|
||||
"sha256": "0mrw7rr6fnjkjxx882ga253kzn4di1agikyq6h9ixwfn2j242qlq"
|
||||
"rev": "91bfd21f86c450b129ac2dde9d33b32e140d8a0c",
|
||||
"sha256": "06fbiggjq1c1z1wgx63ir8rj1ppd1c046xwz4nzsrf1pi8dqcyl7"
|
||||
},
|
||||
"qtandroidextras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
|
||||
"rev": "12d064b16117c6f3418b494c927ef72cf1927929",
|
||||
"sha256": "1rcpldpzwbmyww50rh58avmhgj93ks40bwm0bqz7dgwakm4n76lj"
|
||||
"rev": "197a7e05cda87a4645f30c8ef5044b342442ebd1",
|
||||
"sha256": "0j5al7h2gy67cb2lj4yymdsidr1dcvvahqfysbdl2lwz3zzpdql1"
|
||||
},
|
||||
"qtbase": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtbase.git",
|
||||
"rev": "a43df98d037ad07cf096ef2f775958ceba743613",
|
||||
"sha256": "01bjkfb7ql1f168q67d5jr2xjfrn8bvh1ggiba0algkgll8alad4"
|
||||
"rev": "0e1ff2f06ddac7c32c5a5e0b65e402c9332e56f8",
|
||||
"sha256": "1pfby0ilkikq8802diaslnkxw8qzbp4r0f80v696wfynn973mhdd"
|
||||
},
|
||||
"qtcharts": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtcharts.git",
|
||||
"rev": "393a84ad5b16a9ec93d8a44bebf1ae86e881bc06",
|
||||
"sha256": "1ki307wkm3wxf3jc508zgdr5p7fb297hf0rdg5x1hyv7qb03bvxx"
|
||||
"rev": "7315c48bcec88014e78165bbda54abfcd557e0af",
|
||||
"sha256": "043lbxkaw53qah9ny4nbpp8g7q4rq9x2k21vkprk7nim66d6pmy3"
|
||||
},
|
||||
"qtconnectivity": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
|
||||
"rev": "70020cb64f71dcf2fd65a8a167cb785d2127e159",
|
||||
"sha256": "10kajc98avdz8a7f5ifrrrzwrkdlbsdmiamh7blsnfcix1063ihq"
|
||||
"rev": "99f30db37c63447c59d5fac15bc8feb832a7fd04",
|
||||
"sha256": "09v76kb7fx7bq4vplyk3cf7il3a6f9p673z1l28nrv4w308bhqfy"
|
||||
},
|
||||
"qtdatavis3d": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
|
||||
"rev": "c887477198cae44585fe9db371db0ddf4c3b205e",
|
||||
"sha256": "0fkw096w81lzdj7zgc6xfy719lh10x3f7mqm832mjq86h8f3gyc5"
|
||||
"rev": "79cd0fb6cafcd42e4037ae1363fda3bc2cec934a",
|
||||
"sha256": "19y33v3l4crzrk7qf5qhx7phxkiax14c2q4xjd1klw7n333d43cq"
|
||||
},
|
||||
"qtdeclarative": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
|
||||
"rev": "792a55bb701d233116c3731c7a53ffdb8c67e407",
|
||||
"sha256": "1d87mkl3dj3ysham1rrfxw07jvc5jqh8g2w8psv5858i29aclyqn"
|
||||
"rev": "50c8def854806485d66aabcf6918e8b987032e55",
|
||||
"sha256": "0qvw72w0m1q4yg4l35rh7ydqgp35xqfwpq0pc7q5578n1xspihhn"
|
||||
},
|
||||
"qtdoc": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtdoc.git",
|
||||
"rev": "8a3dfe33cb4f1e81b609f41716a3f0610a50db72",
|
||||
"sha256": "18x3gn6wv8vm5wfa6hjfzbkxcpclnwi4s3mbbc3hj9yar53hznqp"
|
||||
"rev": "bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd",
|
||||
"sha256": "0pvimmw5c6gh6xi2iblzyikgaw7cr8gqjdvyappcahjpalxxsjbw"
|
||||
},
|
||||
"qtgamepad": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtgamepad.git",
|
||||
"rev": "8ed95136b3c265b01db6cc33869228f41878e173",
|
||||
"sha256": "1m774ah9c1didj60rph6p4gibyqgynmdqngqkq1bv1p7m2jkq1ss"
|
||||
"rev": "b1c2f272f69e222a532485e6f820776c220b3535",
|
||||
"sha256": "1zga6sa901g0fpqyjlyj73s2f94yjm0z3599gngnlvvd7jsnlgnv"
|
||||
},
|
||||
"qtgraphicaleffects": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
|
||||
"rev": "e33716bd6bb8926688fef20cb568e11618d08a35",
|
||||
"sha256": "1klm5rhx6lpc0knhc15lz6sj07znv2d601gbi360wfqkvbi3g78p"
|
||||
"rev": "2c39e673d6c15a84dcc7882d3772fa04cc79f9ed",
|
||||
"sha256": "177xkhi3syx6r3my5rly5bncgjfhdvgrhf6fw5ajqplik6yln4pq"
|
||||
},
|
||||
"qtimageformats": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtimageformats.git",
|
||||
"rev": "142040e8a652e708ff6e004361f6bcfe85fefdf9",
|
||||
"sha256": "1vc1ahanm40bh8qj3x2x4d4niihsrjai298alxfcxinfrsmw9m32"
|
||||
"rev": "4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498",
|
||||
"sha256": "1w68v55y1l1biv7krzv9vmi2czz84jk89f4pymq3ri1w3y4rc1id"
|
||||
},
|
||||
"qtlocation": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtlocation.git",
|
||||
"rev": "5b27b8921f1f2de93573df903c47aee634209f80",
|
||||
"sha256": "1w8hq3mdlrdkkykhza4dx0f21j6k697xqqvpm2g2xyk2izadq2m0"
|
||||
"rev": "3beb9c810611337fde61d89aa981e9f177a9ede9",
|
||||
"sha256": "1fwn9x3n01dlkhw53n12z5kb06qj2lmangzvj3fjr5ff0yy47df9"
|
||||
},
|
||||
"qtlottie": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtlottie.git",
|
||||
"rev": "db33cc9a4c0bad1006dbc9ed46d71b80ee284df3",
|
||||
"sha256": "1wjzhk6zn0vh9fjldpi5gi7qlpgfc2gcznh3a7icpbx7n9cc9qh5"
|
||||
"rev": "b8c1fa109dce6f8bff9f55738d2f1e21ff677796",
|
||||
"sha256": "0qydaqj8945hikby7a9529i0g5ycpvhws6y0zc566jv50qida725"
|
||||
},
|
||||
"qtmacextras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtmacextras.git",
|
||||
"rev": "4cb89b861dbdbe8733c62bcdadc0a8d6617528a5",
|
||||
"sha256": "1pygs8l1nk7mgqcgv7ilwx87i9i8jxwxn2h8fcqqvgn96c5sd9kg"
|
||||
"rev": "e66cba7cf02aa8aecce03540cd167621f2cda5f0",
|
||||
"sha256": "0q7d3lh3fpkrakxx1sqx9csa7l7rxzskcavbidxb5298jxn49wn8"
|
||||
},
|
||||
"qtmultimedia": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
|
||||
"rev": "36603a39aa590c12cbe2b192b56b29edd09a7a6b",
|
||||
"sha256": "1i6hfddkwf0x74kxz5vrjkc3r507m6icr59p8b6n1bms5y5731j6"
|
||||
"rev": "53069c9c6eb52b744333812f42aed36c3db6e752",
|
||||
"sha256": "0y8km2mp5mj1zw1v3acsdvzrc1jyiwpxy3rmif5ssn40wwxifilp"
|
||||
},
|
||||
"qtnetworkauth": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
|
||||
"rev": "3fccc9b8fdaff1252fb4a9c516868d0bbbd4384d",
|
||||
"sha256": "0h0i6r5w2vdmm9nxyk8vzdim739fja4ddf42s9pa25r1vs6i9rdw"
|
||||
"rev": "28180f28c98e329676463e24cef0097cba45bc00",
|
||||
"sha256": "1g6clwmrpdvl9m6flyrk4vlckjnjv3phqhy1xbxlra3zcfn3357r"
|
||||
},
|
||||
"qtpurchasing": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
|
||||
"rev": "f563e7f2d1668a3d216e9d396e050df25fd15532",
|
||||
"sha256": "1kbzf8nadia31sfc4r53p3p733i85w23yznwp2fc2117z81vd9p7"
|
||||
"rev": "d4903bf08c576a6c085278c1960a2676cd83dca7",
|
||||
"sha256": "04bry3ys15bd6kaiwyb8fh037s50mcplircpzvrwdc1h8milx7y7"
|
||||
},
|
||||
"qtquick3d": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquick3d.git",
|
||||
"rev": "d4f5966ba085a1146a04f2ea8449bbf14833a593",
|
||||
"sha256": "05617q59ldzavm79bf3vgz2sc4paa6d4s0q7adqzpnib6pryr2xj"
|
||||
"rev": "ad229f0c135f74801fba2bcd22c78abc0e3cf1d2",
|
||||
"sha256": "17jdsahdw72l5lpbng8733qv2fp2qkfzlzrayzigz2slfdqgjxnk"
|
||||
},
|
||||
"qtquickcontrols": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
|
||||
"rev": "1ca962198a703f591efc7c8f7540fc4120746a00",
|
||||
"sha256": "1r4z0lfcs1mhdmxgd7saw49p5y2009a0vxn043v0z2w47yrqprb6"
|
||||
"rev": "9325659ec390eda5b160736a926ba58ccb445cce",
|
||||
"sha256": "0r1kkn6pr6yynk8x2ggkfqqrh27g1qra102ilglj7chsmrp92xgc"
|
||||
},
|
||||
"qtquickcontrols2": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
|
||||
"rev": "134ca5dbef9d137a9c46faa79b0225bc650d9283",
|
||||
"sha256": "09r6a0vdpyxzrhx6h49v9nyky3xzgm0z1wd320qi3zh7baxxrzm4"
|
||||
"rev": "69fea340f8f4c483a9b2889e4e24a4b1b52ebc87",
|
||||
"sha256": "0v6g146ryabks0sff5dgyx42690xckaqpx44c6g7x0b0w24lj6ws"
|
||||
},
|
||||
"qtquicktimeline": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
|
||||
"rev": "58f4f22662023efe6f223d5ef4a6d0be3708182b",
|
||||
"sha256": "15braxxp4ldvfqxz7a1xywskycmkwv88cypgaxfipkis9jvaykdi"
|
||||
"rev": "bf6c73064c82b07fcb1f7e72c263b249e137e224",
|
||||
"sha256": "0pnn5ds6sxls8i6pzzmraalvln2pabgga3gnv761b2skgkv26gnq"
|
||||
},
|
||||
"qtremoteobjects": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
|
||||
"rev": "f64e34be9ac4b7e92c63e47235c04471a1d40c93",
|
||||
"sha256": "1hjg1vimipszcdk89ivq1iym05m9yz2li6chyg52n1wqjm628gx1"
|
||||
"rev": "3873bdc809ca8d58d91968cb0de34da26646bc79",
|
||||
"sha256": "0bncsi45zjwd6q3g40gxdqxqq4zhjrgw7xnxj1v53npbyw4vd0h5"
|
||||
},
|
||||
"qtscxml": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtscxml.git",
|
||||
"rev": "3f56c6b4bd1e3883581340243b4a7289807fffc9",
|
||||
"sha256": "15yhdp77p4i1as53cssx038hwmqjh2zgh35hrad4mhk4g6za85na"
|
||||
"rev": "6834b183966d08d9f061642ee7ea2d482cbbf073",
|
||||
"sha256": "1h88idcfcsbpx2x2djcg1lzazadm676miz19x6n0n6n4gwp46738"
|
||||
},
|
||||
"qtsensors": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtsensors.git",
|
||||
"rev": "3011b16d63cadbb473b6aa3a535b9f0e33170c09",
|
||||
"sha256": "06d5x03bzbal4npbdl8y74fdizl9phz76q29f798196hjyb0kz05"
|
||||
"rev": "bf0b718cd0b6c7823e9d2037d3bdece44185f444",
|
||||
"sha256": "1my7ls1nsaf26kh3hn75jjnxp6gm0ilyfzcczqps0xj7xj9bzwzd"
|
||||
},
|
||||
"qtserialbus": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtserialbus.git",
|
||||
"rev": "c64de6ad9f646aaa66fca0500d21cde802a7bb17",
|
||||
"sha256": "09jp80yrql450bz7c2rfjyyfy0zd59kmrc0lww5ws0lyp95n116y"
|
||||
"rev": "616bc5b962cdcacb1c1ba985d7236392e9cadb8c",
|
||||
"sha256": "0njahb52kshci23xw89j1rgffmrmric8kz54dzmqsmlcqp181qkh"
|
||||
},
|
||||
"qtserialport": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtserialport.git",
|
||||
"rev": "c3a7debff7a4c6ddaedb795290180dd99d7ac4be",
|
||||
"sha256": "1aslr9msddnrkxrlzplbzpfydjkiw1haa67mcsmr2phxkfh05329"
|
||||
"rev": "34c19c6441cd440dc65b59ae7670eadf099d51f8",
|
||||
"sha256": "0hiqfvz5jc6ha6ln8jl8vv4ijsdz55f3zp801dbh2r68cmf9qsrm"
|
||||
},
|
||||
"qtspeech": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtspeech.git",
|
||||
"rev": "c41437acf07c2c4703351b07925fce3ce0e6b75d",
|
||||
"sha256": "1ihv2k4swbhd4kiaprrjgq8kmx3vrg64y2dqkvg6nd26dfwhxr0f"
|
||||
"rev": "8ad0f08ad7e2a8d27dc5e69806812c6a3f298946",
|
||||
"sha256": "0pyiiqj18c2gvbqvgnaki2hzcizi1lam82x761y2lp717sgb09v9"
|
||||
},
|
||||
"qtsvg": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtsvg.git",
|
||||
"rev": "5b1b4a99d6bc98c42a11b7a3f6c9f0b0f9e56f34",
|
||||
"sha256": "0ji4kaphlqmlpcvcvlqklhzmdlwv712cvsdxnv41fdab6b49yghw"
|
||||
"rev": "690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638",
|
||||
"sha256": "1iiml673isnqakjzspq5gf6818zmmd7pj6z9y2jwxb2xkkn8ahpc"
|
||||
},
|
||||
"qttools": {
|
||||
"url": "https://invent.kde.org/qt/qt/qttools.git",
|
||||
"rev": "bd0ceb7de5d0c918ae596150e95b069dca8b9150",
|
||||
"sha256": "100qhcdcnnx0l3sl9zl5p3l7707h7vdbjjk7dmy7ap1r0218m5zy"
|
||||
"rev": "f82ed367d1b80b69d738cfcde534b75854a45476",
|
||||
"sha256": "1pv7af4z3f9d1ifqjwbf7fhgglpnjfby8h2fg5h114mpils661bn"
|
||||
},
|
||||
"qttranslations": {
|
||||
"url": "https://invent.kde.org/qt/qt/qttranslations.git",
|
||||
"rev": "f7745c117041e7adf9705e1de8d71086c160dd9f",
|
||||
"sha256": "0nx8qdg3m4wf8pynh4pr1j0m0p1y5pws7fnx5mpqccvwgj4bwrdj"
|
||||
"rev": "c601106c8b5d5495f951c8ea0ad6a9e171416ae0",
|
||||
"sha256": "0w8ggzc4sxfa1y3n40m24zxp59c2y1mfb2c7zdd8nmlrg7xnqsf0"
|
||||
},
|
||||
"qtvirtualkeyboard": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
|
||||
"rev": "8b885af5ad3c2f2ff500c060a41e312ea7276e50",
|
||||
"sha256": "0mh4bva1msczgwl2x3b960rml5rmxnvvzi1wk94cc51888vyajiv"
|
||||
"rev": "7389450a5de5fdd210f1459abcf73621ec0496bd",
|
||||
"sha256": "1hv8yi4lq3mdxqkcln2b75drdyfiaqj63khzvy09gdf1x6fyjnn5"
|
||||
},
|
||||
"qtwayland": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwayland.git",
|
||||
"rev": "c8b37a1bda9b8f29d56775ed6556d56ac5d3ea1d",
|
||||
"sha256": "15spjyc6gq1r5vdryhm21mhaim1iw24y80p0srp58qm9jwqg9dys"
|
||||
"rev": "75f434f14499eb47ede2cb66f0946527bf555791",
|
||||
"sha256": "17d7bcc3v55ywakaybp88c493bfx63vyiz7n8f5kcijj5q5hdf1r"
|
||||
},
|
||||
"qtwebchannel": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
|
||||
"rev": "6d2f0c3a36d9b2cdcd759a464c608365a0afda98",
|
||||
"sha256": "1aqhvniysjc14xqcwvqhylcd4lpsl5vsym0spfahxs55s9jsvbyl"
|
||||
"rev": "fca83088ef430f96257d2014e77d08bd350259af",
|
||||
"sha256": "1jc7myns24mzfnfybzzjqkpnl235c0fm0zqkai55xwi3vcv9xyr5"
|
||||
},
|
||||
"qtwebglplugin": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
|
||||
"rev": "8f879e6bcf941a612c568fbfe2b49ddb1bb409cd",
|
||||
"sha256": "02glac0m95naxl5c6n22xclxhp7fjl1whf6sf3388h41wwdhv11c"
|
||||
"rev": "3681356904277e055759693551357e7e488d1be9",
|
||||
"sha256": "14v9r4mhqq453dzkc5gvv660gq11zsmzngvwgi44srhzcx7k1qqv"
|
||||
},
|
||||
"qtwebsockets": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
|
||||
"rev": "9a7b9972a54137d5f2e0d49559fe58d07c90662e",
|
||||
"sha256": "1hcf18cls9kmq4xjxzjm2viqs80pxr4ykrzx0vg1bd83bc509vqp"
|
||||
"rev": "dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f",
|
||||
"sha256": "1gbgga8qy26nxxq0537hm3h6la04xb6m4cc2aifjhhhj8py95170"
|
||||
},
|
||||
"qtwebview": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwebview.git",
|
||||
"rev": "53fa44709992faae54e4f5c8a128cea7b6f0cbd5",
|
||||
"sha256": "12w6znmy2hijcnwqqva8abydcryh6jcp8lhx0kz0m3cvhwpq1fbx"
|
||||
"rev": "bbb1891595aba23ff3c6d137aa74442f9e54479b",
|
||||
"sha256": "0j59r6dj4wvassng39whnidd6nzhndwssfwjppppqbs5xy57zh2z"
|
||||
},
|
||||
"qtwinextras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtwinextras.git",
|
||||
"rev": "ee931eba5d129284d5c33157cd7d0b9232fbee7b",
|
||||
"sha256": "17fyfkm8qfl9jmlq3ppnqwdx47230bk2laikfbq2188vn42yxnqv"
|
||||
"rev": "907009a4f7e5d2b99805547caf4b901bdbb0d4d6",
|
||||
"sha256": "0aam2imp4rkbrjir5gsk4ja7vf7vv68ybsh7qchavb3zdmjsvxcd"
|
||||
},
|
||||
"qtx11extras": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtx11extras.git",
|
||||
"rev": "aaa54153970d1d63a44b873cad5f62ffa71ef9b8",
|
||||
"sha256": "0q34pi4mqqi4vzk57f59xsk303jgpk1fkxvnvm9r08jkckxxbisw"
|
||||
"rev": "6c3605fcb3b34e55951f597e06c135d97dfa6cd7",
|
||||
"sha256": "0dqmw2yqh5b5ayq93px2na50ghfk55y55zsgwraxglly0zgm39w9"
|
||||
},
|
||||
"qtxmlpatterns": {
|
||||
"url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
|
||||
"rev": "6e0917d518e07f737cc663b8d632c8021634fd3b",
|
||||
"sha256": "062riy66z3v1fxrdnbdhafqdv67xqz12pscidj4fhhp9fzi92a45"
|
||||
"rev": "087f6f35bd027f940818b1696d0aad822e034377",
|
||||
"sha256": "0y3hkz7ss6iibpfr7dc855bzhdanz79ix0jm6b28viqjy3bdzgar"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchgit, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "5.15.12";
|
||||
version = "5.15.14";
|
||||
|
||||
mk = name: args:
|
||||
{
|
||||
@ -63,31 +63,25 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
||||
};
|
||||
};
|
||||
|
||||
catapult = fetchgit {
|
||||
url = "https://chromium.googlesource.com/catapult";
|
||||
rev = "5eedfe23148a234211ba477f76fc2ea2e8529189";
|
||||
hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o=";
|
||||
};
|
||||
|
||||
qtscript = rec {
|
||||
version = "5.15.16";
|
||||
version = "5.15.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtscript";
|
||||
rev = "v${version}-lts";
|
||||
hash = "sha256-4Jqsmk5EBQ2Biv69yYCNx7l7AWFikRMBfl0fbZcsSaA=";
|
||||
hash = "sha256-wXEKdu2gdlkVsWr3nb/tCBwyo9H8GPHWTUele1cP0ks=";
|
||||
};
|
||||
};
|
||||
|
||||
qtwebengine = rec {
|
||||
version = "5.15.16";
|
||||
version = "5.15.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtwebengine";
|
||||
rev = "v${version}-lts";
|
||||
hash = "sha256-Arg/tfJcx9+CSV1VXBieHNoCSwmWNTnyBdgSkthOdfA=";
|
||||
hash = "sha256-1be8Y96yHYBCxQsRC/PD2X0TVWpA2/r1hvi8sBKOais=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ qtModule
|
||||
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
|
||||
|
||||
, bison, flex, git, gperf, ninja, pkg-config, python, which, python3
|
||||
, nodejs, qtbase, perl
|
||||
, bison, flex, git, gperf, ninja, pkg-config, python, which
|
||||
, nodejs, perl
|
||||
, buildPackages
|
||||
, pkgsBuildTarget
|
||||
, pkgsBuildBuild
|
||||
@ -22,7 +22,7 @@
|
||||
, ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit
|
||||
, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication
|
||||
, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate
|
||||
, cups, openbsm, runCommand, xcbuild, writeScriptBin
|
||||
, cups, openbsm, xcbuild, writeScriptBin
|
||||
, ffmpeg_4 ? null
|
||||
, lib, stdenv
|
||||
, version ? null
|
||||
@ -32,7 +32,6 @@
|
||||
, postPatch ? ""
|
||||
, nspr
|
||||
, lndir
|
||||
, dbusSupport ? !stdenv.isDarwin, expat
|
||||
}:
|
||||
|
||||
let
|
||||
@ -52,17 +51,12 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
qtPlatformCross = plat: with plat;
|
||||
if isLinux
|
||||
then "linux-generic-g++"
|
||||
else throw "Please add a qtPlatformCross entry for ${plat.config}";
|
||||
|
||||
in
|
||||
|
||||
qtModule ({
|
||||
pname = "qtwebengine";
|
||||
nativeBuildInputs = [
|
||||
bison flex git gperf ninja pkg-config python which gn nodejs
|
||||
bison flex git gperf ninja pkg-config (python.withPackages(ps: [ ps.html5lib ])) which gn nodejs
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
perl
|
||||
lndir (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase)
|
||||
@ -93,12 +87,6 @@ qtModule ({
|
||||
|
||||
# TODO: be more precise
|
||||
patchShebangs .
|
||||
|
||||
# Fix compatibility with python3.11
|
||||
substituteInPlace tools/metrics/ukm/ukm_model.py \
|
||||
--replace "r'^(?i)(|true|false)$'" "r'(?i)^(|true|false)$'"
|
||||
substituteInPlace tools/grit/grit/util.py \
|
||||
--replace "mode = 'rU'" "mode = 'r'"
|
||||
)
|
||||
''
|
||||
# Prevent Chromium build script from making the path to `clang` relative to
|
||||
|
||||
Loading…
Reference in New Issue
Block a user