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
gobject-introspection: 1.60.0 -> 1.60.1 #59406
Conversation
Updated the shlib patches: - Upstream now forces basename in sanitize_shlib_path(lib) if the system isn't darwin. We patch the function to always prefer absolute paths - Due to the above we no longer need the macos patch - `sanitize_shlib_path` is applied after `resolve_from_ldd_output` so we need to apply `fallback_libpath` afterwards too (else we get stuff like `/nix/store/...@rpath/foo.dylib` on darwin) - Note that the `fallback_path` no longer have any unit tests https://gitlab.gnome.org/GNOME/gobject-introspection/blob/1.60.1/NEWS
@GrahamcOfBorg build gobject-introspection |
Maybe macOS now has the dependencies in cache? |
IIRC the builds finished successfully when targeting master. |
|
||
|
||
-def resolve_from_ldd_output(libraries, output, basename=False): | ||
+def resolve_from_ldd_output(libraries, output, basename=False, fallback_libpath=""): | ||
def sanitize_shlib_path(lib): |
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.
So it might be better to pass fallback_libpath
here and let the function return the sanitizer function, that way we could unit test the fallback libpath, though probably not a big deal. Any thoughts @jtojnar
I did a rebuild of my system using this and the glib update, haven't seen any issues. Pretty confident this is good to go. |
Things done
Updated the shlib patches:
darwin. We patch the function to always prefer absolute paths
sanitize_shlib_path
is applied afterresolve_from_ldd_output
so we need toapply
fallback_libpath
afterwards too (else we get stuff like/nix/store/...@rpath/foo.dylib
on darwin)fallback_path
no longer have any unit tests. To fix this it might be better makingsanitize_shlib_path
takefallback_path
as an argument and return a sanitizer which applies it, though not sure if it's a big deal.https://gitlab.gnome.org/GNOME/gobject-introspection/blob/1.60.1/NEWS
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)