sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9 #31120
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matthiasbeyer
approved these changes
Nov 2, 2017
c0bw3b
reviewed
Nov 2, 2017
|
|
||
| cmakeFlags = [ "-DUSE_QT5=TRUE" ]; | ||
|
|
||
| # A regression was introduced in CMakeLists.txt on v3.9.x | ||
| # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 | ||
| postPatch = '' | ||
| substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' | ||
| substituteInPlace CMakeLists.txt \ | ||
| --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' \ |
There was a problem hiding this comment.
That substitution is not needed anymore: CMakeLists.txt was fixed upstream for 3.10.x
You can also remove the 2 lines of comments above regarding this past issue.
orivej
suggested changes
Nov 2, 2017
| mkDerivation rec { | ||
| version = "3.10.0"; | ||
| let | ||
| qscintillaLib = (qscintilla.override { withQt5 = true; }); |
There was a problem hiding this comment.
libsForQt5 provide qscintilla with withQt5, no need to override.
| homepage = http://sqlitebrowser.org/; | ||
| license = licenses.gpl3; | ||
| maintainers = with maintainers; [ matthiasbeyer ]; | ||
| platforms = platforms.linux; # can only test on linux |
There was a problem hiding this comment.
Please, don't align attributes for simplicity and consistency with other packages.
There was a problem hiding this comment.
We need a style guide...
|
Unless @ttuegel has any problems with the ugly "make it work with qt 5.9" stuff in here, I'm going to go ahead and merge this. |
orivej
approved these changes
Nov 6, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
We were building it against qt 5.6 but it can be made to work with 5.9. Not sure if this is the right way to do this though (getting rid of references to Test and PrintSupport).
Cc: @matthiasbeyer @ttuegel
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)