Skip to content

gobject-introspection: override pkg-config variables in a setup hook#181413

Merged
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:introspectionfun
Jul 14, 2022
Merged

gobject-introspection: override pkg-config variables in a setup hook#181413
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:introspectionfun

Conversation

@Artturin
Copy link
Copy Markdown
Member

@Artturin Artturin commented Jul 13, 2022

instead of substituteInPlace

fixes gtk2 because it needs g_ir_scanner to be a path

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 marked this pull request as draft July 13, 2022 23:17
@Artturin Artturin requested a review from Mindavi July 13, 2022 23:17
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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 Jul 13, 2022
jtojnar
jtojnar reviewed Jul 13, 2022
View reviewed changes
pkgs/development/libraries/gobject-introspection/wrapper.nix Outdated
Copy link
Copy Markdown
Member

@jtojnar jtojnar Jul 13, 2022

Choose a reason for hiding this comment

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

The comment is outdated.

Copy link
Copy Markdown
Member Author

@Artturin Artturin Jul 13, 2022

Choose a reason for hiding this comment

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

join the cross-compilation room on matrix https://matrix.to/#/#cross-compiling:nixos.org

Copy link
Copy Markdown
Member Author

@Artturin Artturin Jul 14, 2022

Choose a reason for hiding this comment

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

should be up to date now

@Artturin Artturin force-pushed the introspectionfun branch 2 times, most recently from 994c751 to d602811 Compare July 14, 2022 00:30
@ofborg ofborg bot requested a review from jtojnar July 14, 2022 00:39
@Artturin Artturin marked this pull request as ready for review July 14, 2022 00:41
@Artturin Artturin marked this pull request as draft July 14, 2022 01:02
@Artturin
Copy link
Copy Markdown
Member Author

Artturin commented Jul 14, 2022

now .#pkgsCross.aarch64-multiplatform.buildPackages.librsvg is broken

librsvg> /nix/store/6yczc5iikg0rj5cx42hvssls63dyikp9-gobject-introspection-1.72.0-dev/share/gobject-introspection-1.0/Makefile.introspection:43: *** Need to define INTROSPECTION_SCANNER.  Stop.

@Artturin
gobject-introspection: override pkg-config variables in a setup hook
e8ecd00 
instead of substituteInPlace

fixes gtk2 because it needs g_ir_scanner to be a path
Artturin
Artturin commented Jul 14, 2022
View reviewed changes
pkgs/development/libraries/gobject-introspection/wrapper.nix
# variable with pkg-config they'll get the host version which can't be run
# override the variable to use the absolute path to g_ir_X in PATH which can be run
+ ''
cat >> $dev/nix-support/setup-hook <<-'EOF'
Copy link
Copy Markdown
Member Author

@Artturin Artturin Jul 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

changing EOF to 'EOF' fixed the issue with librsvg, it was replacing the type -p g-ir-scanner during the cat which would be empty

@Artturin Artturin marked this pull request as ready for review July 14, 2022 04:25
@Artturin Artturin merged commit ada1713 into NixOS:staging Jul 14, 2022
@Artturin Artturin deleted the introspectionfun branch July 14, 2022 15:16
@Artturin Artturin mentioned this pull request Jul 14, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mindavi Mindavi Awaiting requested review from Mindavi

@hedning hedning Awaiting requested review from hedning

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@dasj19 dasj19 Awaiting requested review from dasj19

@lovek323 lovek323 Awaiting requested review from lovek323

@amaxine amaxine Awaiting requested review from amaxine

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees

No one assigned

Labels

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. 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.

2 participants

@Artturin @jtojnar