qt58: extend darwin compatibility #24340
Conversation
periklis
force-pushed
the
topic_qt58_modules
branch
11 times, most recently
from
ab86039
to
dbd921a
Compare
periklis
force-pushed
the
topic_qt58_modules
branch
from
dbd921a
to
6c51001
Compare
periklis
changed the title
|
I had to pull the last two packages qtwebkit and qtwebengine out of this PR. The reason is in the way we handle the qmake-mkspecs for the mac plattform. It needs rework in order to have a cleaner setup than the sed-lines in postPatch in |
|
|
||
| propagatedBuildInputs = [ | ||
| dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent | ||
| #dbus zlib minizip snappy nss protobuf jsoncpp libevent |
There was a problem hiding this comment.
Maybe we should delete this line if each dependency is listed elsewhere.
There was a problem hiding this comment.
thx, i'll have to give qtwebengine and qtwebkit a special look by rewriting the sed-stuff i mentioned above. The main reason is that because of the the sed-stuff OpenGL and CoreFoundation cannot be propagated correctly.
There was a problem hiding this comment.
Wow, that sounds unusual, I look forward to seeing what's going on!
|
Seems okay to me (sans a small nitpick, same as @acowley's) but I did only a very quick review (I don't have much time now, sorry!). Also seen some generic improvements (wrapping some Qt utilities). |
periklis
force-pushed
the
topic_qt58_modules
branch
3 times, most recently
from
325635f
to
27380c6
Compare
periklis
force-pushed
the
topic_qt58_modules
branch
from
27380c6
to
8f4ad56
Compare
|
@LnL7 would you mind to review and if you like merge this PR? |
periklis
force-pushed
the
topic_qt58_modules
branch
2 times, most recently
from
04821c5
to
3e3b287
Compare
| postFixup = '' | ||
| moveToOutput "bin/qdbus" "$out" | ||
| moveToOutput "bin/qtpaths" "$out" | ||
| ''; | ||
|
|
||
| postInstall = '' | ||
| wrapQtProgram $out/bin/qcollectiongenerator |
There was a problem hiding this comment.
Are these all the binaries? If so it's probably better to use a glob here so programs added in a new version are also wrapped.
There was a problem hiding this comment.
No only the binaries that have dynamic library dependencies.
| # Therefore WebKit provides adequate header files. | ||
| INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH | ||
| - LIBS += -licucore | ||
| + LIBS += /usr/lib/libicucore.dylib |
There was a problem hiding this comment.
This should probably be added to __impureHostDeps
There was a problem hiding this comment.
Thx for the hint, but can you elaborate what impact __impureHostDeps has on buildInputs and the like?
periklis
force-pushed
the
topic_qt58_modules
branch
2 times, most recently
from
e620743
to
834c92c
Compare
periklis
force-pushed
the
topic_qt58_modules
branch
from
834c92c
to
775531c
Compare
|
@LnL7 Can we merge this? So that i can build upon these to figure out why qtwebkit fails. Thx in advance. |
Motivation for this change
Enable failing QT-Modules for building
qt58.fullforx86_64-darwin:- [ ] QTWebEngine- [ ] QTWebKitWrap failing QT-Apps:
Assistant.app, Designer.app, Linguist.app, pixeltool.app, qdbusviewer.app, qml.appqmleasing, qmlscene, qmltestrunnerEnable darwin-specific QT-Modules:
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)