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.

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

gobject-introspection: propagate self/targetself to avoid having to add gobject-introspection to buildInputs #189215

Merged
merged 2 commits into from
Sep 2, 2022

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Sep 1, 2022

see commit msgs

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.

the flags defined in it are required if the hostPlatform can't be executed
@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Sep 1, 2022
@Artturin Artturin changed the title gobject-introspection: enable strictDeps and improve cross conditional gobject-introspection: propagate self/targetself to avoid having to add gobject-introspection to buildInputs Sep 1, 2022
…dd gobject-introspection to buildInputs

i should probably move to use the wrapper when host != build and do the
canExecute things inside the wrapper.nix

then i could use gobject-introspection-unwrapped in it even when
host == build

void also adds gobject-introspection to makeDepends when its gir build
helper is used
@@ -18,6 +18,7 @@ in

(gobject-introspection-unwrapped.override args).overrideAttrs (previousAttrs: {
pname = "gobject-introspection-wrapped";
depsTargetTargetPropagated = [ gobject-introspection-unwrapped ];
Copy link
Member

Choose a reason for hiding this comment

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

I am still not convinced this is correct solution for the Meson issue. gobject-introspection in buildInputs only makes sense for apps (since they will need cairo’s or GLib’s typelibs). Libraries (for which the Meson’s GIR generation is relevant) should not need those.

Copy link
Member Author

@Artturin Artturin Sep 8, 2022

Choose a reason for hiding this comment

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

It would be nice to remove it but (meson,configure script,probably cmake too) build systems look for it with pkg-config and use the binary variables in the pc file

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants