Skip to content
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.

Sign up for GitHub

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

Jump to bottom

gobject-introspection: Fix macos shared lib paths #46310

Merged
merged 1 commit into from Nov 21, 2018
Merged

gobject-introspection: Fix macos shared lib paths #46310

merged 1 commit into from Nov 21, 2018

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.

@xeji xeji requested a review from jtojnar September 7, 2018 11:01
jtojnar
jtojnar requested changes Sep 7, 2018
View reviewed changes
Copy link
Contributor

@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
Contributor

jtojnar commented Sep 7, 2018 •
edited

Also relevant #45950, which updates gobject-introspection.

@hamishmack hamishmack mentioned this pull request Sep 7, 2018
Closed
9 tasks
@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
Contributor

jtojnar commented Sep 26, 2018

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

@hamishmack
Copy link
Contributor Author

Yes

matthewbauer
matthewbauer approved these changes Oct 5, 2018
View reviewed changes
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 •
edited

@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
Contributor

jtojnar commented Nov 13, 2018 •
edited

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
Merged
9 tasks
@cdepillabout cdepillabout mentioned this pull request Nov 20, 2018
Merged
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
@jtojnar jtojnar mentioned this pull request Dec 24, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar requested changes

@matthewbauer matthewbauer matthewbauer approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@hamishmack @jtojnar @cdepillabout @matthewbauer @GrahamcOfBorg