Skip to content

gobject-introspection: fix non-meson cross builds#185097

Merged
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:gobjectfunfixes
Aug 31, 2022
Merged

gobject-introspection: fix non-meson cross builds#185097
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:gobjectfunfixes

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Aug 4, 2022

TODO write msg

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Artturin Artturin requested a review from Mindavi August 4, 2022 05:54
@ofborg ofborg bot 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. labels Aug 4, 2022
@ofborg ofborg bot requested a review from msteen August 4, 2022 07:25
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 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. labels Aug 4, 2022
Mindavi
Mindavi approved these changes Aug 4, 2022
View reviewed changes
Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

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

Further down the rabbit hole... This seems good other than one question I have.

Also, what did you build/try?

pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh Outdated
Copy link
Contributor

@Mindavi Mindavi Aug 4, 2022

Choose a reason for hiding this comment

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

What's with the subproject? I don't understand why it's matching on that here...

Copy link
Member Author

@Artturin Artturin Aug 5, 2022

Choose a reason for hiding this comment

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

check the comment

@Artturin
Copy link
Member Author

Artturin commented Aug 5, 2022 •
edited
Loading

Also, what did you build/try?

pkgsCross.aarch64-multiplatform.libdbusmenu* and pkgsCross.aarch64-multiplatform.modemmanager

this PR will also make the adding gobject-introspection to buildInputs PRs unneeded and the first commit will fix most todos in #184023

@ofborg ofborg bot requested review from 7c6f434c and lovek323 August 5, 2022 02:10
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 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: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 5, 2022
@Artturin Artturin mentioned this pull request Aug 9, 2022
Closed
13 tasks
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 9, 2022
@Artturin Artturin force-pushed the gobjectfunfixes branch 2 times, most recently from 737f0e1 to 79a6a93 Compare August 13, 2022 03:13
@Artturin
Copy link
Member Author

Artturin commented Aug 16, 2022

will make a separate pr for the other fixes

@github-actions github-actions bot removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python Python is a high-level, general-purpose programming language. labels Aug 16, 2022
@ofborg ofborg bot 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-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Aug 30, 2022
@Artturin
gobject-introspection: wrapper: add .libs to LD_LIBRARY_PATH for emul…
267ef1f 
…ator

fixes issues like
libdbusmenu-gtk3-aarch64-unknown-linux-gnu> /build/libdbusmenu-16.04.0/libdbusmenu-gtk/tmp-introspect2jhtiwwn/.libs/DbusmenuGtk3-0.4:
error while loading shared libraries: libdbusmenu-glib.so.4: cannot open shared object file: No such file or directory
in non-meson builds

i think the reason we need this in all non-meson builds is because of ./pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch

see: https://github.com/void-linux/void-packages/blob/master/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper
https://github.com/openembedded/openembedded-core/blob/c5a14f39a6717a99b510cb97aa2fb403d4b98d99/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb#L74
@Artturin Artturin marked this pull request as ready for review August 31, 2022 21:42
@Artturin Artturin merged commit acd53be into NixOS:staging Aug 31, 2022
@Artturin Artturin deleted the gobjectfunfixes branch August 31, 2022 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@Mindavi Mindavi Mindavi approved these changes

@msteen msteen Awaiting requested review from msteen

@lovek323 lovek323 Awaiting requested review from lovek323

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@dasj19 dasj19 Awaiting requested review from dasj19

@hedning hedning Awaiting requested review from hedning

@jtojnar jtojnar Awaiting requested review from jtojnar

@amaxine amaxine Awaiting requested review from amaxine

@bobby285271 bobby285271 Awaiting requested review from bobby285271

Assignees

No one assigned

Labels

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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Artturin @SuperSandro2000 @Mindavi