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
Gnome updates staging #80594
Gnome updates staging #80594
Conversation
67871d5
to
3f110a9
Compare
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.
Changes look okay.
We need to drop libpeas pkgconfig patch as it's now upstream: https://gitlab.gnome.org/GNOME/libpeas/commit/dce9ad9576d87cb1244f76e14571b73d09a6a3d8 |
Thanks, I haven't yet checked if things built 👍 Will do that. |
3f110a9
to
6e00050
Compare
Need to fix glib's |
6e00050
to
dfa4187
Compare
Did that. Please review that patch. I've built a selection of packages at the top. @GrahamcOfBorg build gtk3 glib (^ cuz darwin) |
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), | ||
'schemasdir=' + join_paths('${datadir}', schemas_subdir), | ||
'bindir=' + join_paths('${prefix}', get_option('bindir')), | ||
+ 'devbindir=' + get_option('devbindir'), | ||
'giomoduledir=' + giomodulesdir, | ||
'giomoduledir=' + pkgconfig_giomodulesdir, |
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.
The change here from upstream was doing a join_paths('${prefix}...
on the gio_module_dir
option, which we don't use 0. They renamed the variable at the same time. Updated patch should be fine 👍
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.
Thanks for checking, I come across the same to be sure 💟
Wahh, darwin timed out. |
Looks like fede9f6 broke folks. |
This was missed in NixOS#80594. Also re-enable tests.
Thanks @jtojnar |
Motivation for this change
Usual,
we should probably merge master into staging because of the other updates.I did that.Changes https://gist.github.com/worldofpeace/d8a8148b0d4f770678851fc66528ef28
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)