Fix gobject-introspection, and package gnome-builder and dependencies #44187
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
Upstream hadn't been parsing ldd output correctly, and this Nix-specific patch appears to have been an attempt to work around the bug. However, this patch still didn't parse ldd output fully correctly. Meanwhile, upstream recently landed a patch on their master branch to make ldd output parsing work across all their supported platforms, which in my testing appears to give correct results on NixOS across a large sample of GNOME libraries. So this commit replaces the Nix-specific ldd-parsing patch with a backport of upstream's version, which can then be dropped entirely once upstream ships a new release and nixpkgs upgrades to it. The only backporting required was that upstream is now maintaining both their old autotools build system as well as a new Meson-based build, so I used filterdiff to strip out the part of the patch which touched meson.build, leaving only the Makefile.am equivalent behind. In addition to the above changes, this upstream patch required Python 3, so I also changed the Python major version used in the gobject-introspection tools.
|
See also #33270 |
$ less $(nix-build -A atk.dev)/share/gir-1.0/Atk-1.0.gir | grep shared
shared-library="libatk-1.0.so.0"Does not look working to me. We want absolute paths. |
|
Also, some packages depend on that patch. For example |
|
Thank you for these pointers. After carefully reading a lot of commits, I figured out how to make your patches to gobjectIntrospection and meson work. Since the result doesn't need to be based on staging, I've opened a new PR for that in #44217. |
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
I wanted to package GNOME Builder, but to do so I first had to package two other gnome.org libraries, and then I had to fix what appears to be a bug in the Nix packaging for gobject-introspection. That bug is described in the commit message in the first commit in this series, so here I'll focus on details about the series as a whole.
I've based this series against staging, because gobject-introspection has a lot of reverse dependencies. Implicitly, I've tested 33 packages that depend on gobject-introspection that are in the transitive closure of GNOME Builder, and they work correctly with this commit. The existing packages apparently worked correctly without this fix as well, but GNOME Builder in particular installs its libide-1.0.so in an unusual path that
g-ir-scannercouldn't previously parse fromlddoutput.The three new packages don't need to be built against staging, but they aren't useful without the whole series, so I figure they should all get build-tested at once.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)