-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sqlitebrowser: fix build #43047
sqlitebrowser: fix build #43047
Conversation
This patch slightly cleans up the `sqlitebrowser` derivation and switches from a cmake-based build to a qmake build using `qmakeConfigurePhase` and the corresponding hook. QMake is far more suitable for QT-based builds (and suggested e.g. here NixOS#42320 (comment)), furthermore the CMake build suffers from issues like missing commands including `qt5_use_modules`. Fixes NixOS#42320 See https://hydra.nixos.org/build/76952038
/cc @peterhoeg @sjau |
@GrahamcOfBorg build sqlitebrowser |
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: sqlitebrowser Partial log (click to expand)
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: sqlitebrowser Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: sqlitebrowser Partial log (click to expand)
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: sqlitebrowser Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: sqlitebrowser Partial log (click to expand)
|
{ mkDerivation, lib, fetchFromGitHub, cmake, antlr | ||
, qtbase, qttools, qscintilla, sqlite }: | ||
{ mkDerivation, lib, fetchFromGitHub, qmake, antlr, qscintilla | ||
, qtbase, qttools, sqlite |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean to move qscintilla
up?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nope. in fact sqlitebrowser
provides its own qscintila
for the build process (but not even the old CMake derivation used this.
But you're absolutely right, I'll revert this to make the diff easier to read.
I have merged #42351, so this PR is no longer necessary. I'd prefer to keep the cmake based build because it appears to be in better shape (no |
I've always learnt that
Of course, feel free to add me to the maintainers list! :) |
Motivation for this change
This patch slightly cleans up the
sqlitebrowser
derivation andswitches from a cmake-based build to a qmake build using
qmakeConfigurePhase
and the corresponding hook.QMake is far more suitable for QT-based builds (and suggested e.g. here
#42320 (comment)),
furthermore the CMake build suffers from issues like missing commands
including
qt5_use_modules
.Fixes #42320
See https://hydra.nixos.org/build/76952038
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)