Skip to content

gobject-introspection: Fix macos shared lib paths#46310

Merged
matthewbauer merged 1 commit intoNixOS:stagingfrom
hamishmack:gobject-introspection-macos
Nov 21, 2018
Merged

gobject-introspection: Fix macos shared lib paths#46310
matthewbauer merged 1 commit intoNixOS:stagingfrom
hamishmack:gobject-introspection-macos

Conversation

@hamishmack
Copy link
Contributor

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-atk and haskellPackages.gi-gdkpixbuf build on macos (both of which had were broken by #40599). I also checked the @rpath was gone in:

$ cat $(nix-build ./default.nix -A atk.dev --system x86_64-darwin)/share/gir-1.0/Atk-1.0.gir | grep shared-library
             shared-library="/nix/store/25659xy1p1naj0c0rc1xf9bfj4l1ryij-atk-2.28.1/lib/libatk-1.0.0.dylib"
Things done:
  • Tested using sandboxing (nix-build --option build-use-chroot true or nix.useChroot on NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.
More

Fixes issue #

cc @


Please note, that points are not mandatory, but rather desired.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Sep 7, 2018
@xeji xeji requested a review from jtojnar September 7, 2018 11:01
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@jtojnar
Copy link
Member

jtojnar commented Sep 7, 2018

Also relevant #45950, which updates gobject-introspection.

@hamishmack
Copy link
Contributor Author

Can't submit a PR because the code has changed and seems to be overall not working at all

@jtojnar I presume that is in reference to the upstream git repo for gobject-introspection.

Also relevant #45950, which updates 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?

@jtojnar
Copy link
Member

jtojnar commented Sep 26, 2018

Will this fix https://hydra.nixos.org/build/82003202?

@hamishmack
Copy link
Contributor Author

Yes

Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Make sure it goes into staging though.

@cdepillabout
Copy link
Member

cdepillabout commented Nov 13, 2018

@matthewbauer @hamishmack @jtojnar
Any update on this PR or #46312?

The gi-atk Haskell package is not building for me on darwin, and I think either this PR or #46312 would fix it.

@jtojnar
Copy link
Member

jtojnar commented Nov 13, 2018

It would be nice to have some tests, otherwise most of us really cannot ensure it works.

@cdepillabout
Copy link
Member

@jtojnar What sort of tests are you thinking of?

I would think that if the haskellPackages.gi-atk package can be built, it would be a sign that this PR works?

I cherry-picked the change from this PR to the top of current master and confirmed that both ATK and haskellPackages.gi-atk compiled on darwin:

cdepillabout@d753fb7

(However, now I am having trouble with #41340. I don't think it is related to this patch.)

@hedning hedning mentioned this pull request Nov 14, 2018
9 tasks
@cdepillabout cdepillabout mentioned this pull request Nov 20, 2018
9 tasks
@matthewbauer matthewbauer changed the base branch from master to staging November 21, 2018 21:38
@matthewbauer matthewbauer merged commit 67b7a57 into NixOS:staging Nov 21, 2018
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Nov 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants