-
Notifications
You must be signed in to change notification settings - Fork 133
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
Nix support and use #1168
base: main
Are you sure you want to change the base?
Nix support and use #1168
Conversation
I managed to get this building on Arch. There's a few issues I found. Major issue: It looks like it always rebuilds the whole thing from scratch for every tiny change when using It always builds against Qt6 in release mode with LTO enabled with no server (which means also no "host on this computer") and no tools. For development, you want to be able to build in debug mode, against Qt5 and in different configurations. The build seems to spew a The build doesn't seem to run in the git repository, which means the version detection doesn't doesn't work. There's also a bug in the cmake scripts that causes the fallback version to not be set, so currently it ends up with a blank version, but that's fixed in 3eeea57. It would be nicer if it used the proper version, which could be passed explicitly using Also not that important: Qt whinges about the locale not being UTF-8 when starting up Drawpile. It fixes that on its own, but it would be nicer to not have a goofy locale in the first place to avoid the warning. I dunno if that's an issue that can be fixed in the flake or if that's a problem with nix itself. Also Very small annoyance: there's trailing whitespace in flake.nix and a missing line feed at the end of default.nix and shell.nix. Git warns about these and when someone with a properly configured editor edits those files, they'll get stray changes in their diffs because of this. You should fix your editor configuration so that it strips errant whitespace at the end of lines and properly terminates the last line of files with a line feed. Drawpile's repository doesn't allow merge commits and I'm not sure how well GitHub would handle rebasing on its own, so ideally do that locally to get your branch updated, rather than doing merges. It should just be: # Assuming you have the official Drawpile remote as "drawpile"
git fetch drawpile
git rebase drawpile/main
# The log should now show that your commit is on top of Drawpile's main, without any merge commits
git log
# If that worked, overwrite the remote branch.
git push -f That should just get rid of those "Merge branch…" commits and instead just put your commit(s) on top of the current state cleanly. |
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.
See comment above, GitHub wants me to write another.
Here is the v2 nix flake: |
41bbdb5
to
482fb78
Compare
a407d6d
to
fff8f37
Compare
zmieniono: flake.nix zmieniono: shell.nix
Tested on NixOs and Arch