gobject-introspection: Fix macos shared lib paths#46310
gobject-introspection: Fix macos shared lib paths#46310matthewbauer merged 1 commit intoNixOS:stagingfrom
Conversation
Uses patch Nirbheek Chauhan's patch from this issue upstream issue: https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 Fixes NixOS#40599
jtojnar
left a comment
There was a problem hiding this comment.
Can't submit a PR because the code has changed and seems to be overall not working at all
https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222#note_302924
|
Also relevant #45950, which updates gobject-introspection. |
@jtojnar I presume that is in reference to the upstream git repo for gobject-introspection.
I have sent PR #46312 to to update the gnome-3.30 branch. Should we close this PR in favour of that one? Will gnome-3.30 be merged soon? |
|
Will this fix https://hydra.nixos.org/build/82003202? |
|
Yes |
matthewbauer
left a comment
There was a problem hiding this comment.
Looks good to me! Make sure it goes into staging though.
|
@matthewbauer @hamishmack @jtojnar The |
|
It would be nice to have some tests, otherwise most of us really cannot ensure it works. |
|
@jtojnar What sort of tests are you thinking of? I would think that if the I cherry-picked the change from this PR to the top of current (However, now I am having trouble with #41340. I don't think it is related to this patch.) |
This applies the proposed upstream patch (described in https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222) before applying the current nixpkgs patches (which had to be updated slightly to apply on top of the upsteam patch).
I tested this fix by building
haskellPackages.gi-atkandhaskellPackages.gi-gdkpixbufbuild on macos (both of which had were broken by #40599). I also checked the@rpathwas gone in:Things done:
nix-build --option build-use-chroot trueor nix.useChroot on NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)More
Fixes issue #
cc @
Please note, that points are not mandatory, but rather desired.