Skip to content

gobject-introspection: use wrapper.nix for the native package too#200337

Merged
Artturin merged 5 commits intoNixOS:stagingfrom
Artturin:crossfixes4
Nov 11, 2022
Merged

gobject-introspection: use wrapper.nix for the native package too#200337
Artturin merged 5 commits intoNixOS:stagingfrom
Artturin:crossfixes4

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Nov 9, 2022

so we can propagate the dev output

during the build of i3ipc-glib with strictDeps enabled i noticed that
gobject-introspection was not being detected and it was due to
gobject-introspection path not being in the PKG_CONFIG_PATH variable

this commit makes gobject-introspection get detected when build==host

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 force-pushed the crossfixes4 branch 2 times, most recently from bd05fb0 to 0f00f29 Compare November 9, 2022 05:21
Artturin
Artturin commented Nov 9, 2022
View reviewed changes
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must 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. 8.has: clean-up This PR removes packages or removes other cruft labels Nov 9, 2022
@Artturin
gobject-introspection: use wrapper.nix for the native package too
b2f9cd3 
so we can propagate the dev output

during the build of i3ipc-glib with strictDeps enabled i noticed that
gobject-introspection was not being detected and it was due to
gobject-introspection path not being in the PKG_CONFIG_PATH variable

this commit makes gobject-introspection get detected when build==host
@Artturin
i3ipc-glib: fix cross
34e8a6d
@Artturin
keybinder3: fix cross
83f0198
@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Nov 9, 2022
@Artturin
gtksourceview{4,5}: fix cross
62f9cc2 
5 depends on opencv for which cross doesn't work so i coudlnt test it
@Artturin
libwnck: fix cross
5f09efa
@Artturin Artturin marked this pull request as ready for review November 9, 2022 23:06
@Artturin Artturin merged commit 17fbc9a into NixOS:staging Nov 11, 2022
@Artturin Artturin deleted the crossfixes4 branch November 11, 2022 01:19
@vcunat
Copy link
Member

vcunat commented Nov 21, 2022

Some builds disappeared on Hydra, most probably because of this PR, but it's really confusing for me: https://hydra.nixos.org/eval/1785874?filter=gobject-introspection#tabs-removed

@Artturin
Copy link
Member Author

Artturin commented Nov 21, 2022

it's because meta isn't in drvAttrs because meta is "passthru" and not included in the drv

i'll fix it

@Artturin
Copy link
Member Author

Artturin commented Nov 21, 2022

#202222

sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
harfbuzz: remove unnecessary gobject-introspection from buildInputs
82c7745 
Since NixOS#200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
pango: remove unnecessary gobject-introspection from buildInputs
58cc83d 
Since NixOS#200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
gdk-pixbuf: remove obsolete gobject-introspection from buildInputs
3d881c4 
Since NixOS#200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
json-glib: remove unnecessary gobject-introspection from buildInputs
39cfb6b 
Since NixOS#200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
libsoup: remove unnecessary gobject-introspection from buildInputs
2432db9 
Since NixOS#200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
tracker: remove obsolete gobject-introspection from buildInputs
6c84ab4 
Since NixOS#200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
gtk3: remove obsolete gobject-introspection from buildInputs
0b6efca 
Since NixOS#200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 3, 2023
@sternenseemann
jre, temurin-bin: fix eval in pkgsCross.ghcjs.buildPackages
b711b52 
Since NixOS#200337 gobject-introspection propagates itself via
depsTargetTargetPropagated, so one doesn't have to add it to every
derivation twice. The problem is that gobject-introspection still is in
a lot of buildInputs and will thus propagate itself again for target,
breaking evaluation unnecessarily if gobject-introspection doesn't
evaluate on whatever the target platform turns out to be.

temurin-bin and openjdk19 caused such a situation via gtk3 which GHC's
JavaScript backend depends on. To fix evaluation of those packages in
pkgsCross.ghcjs.buildPackages, we'll just disable the features pulling
in gtk3 until this is fixed properly.
sternenseemann added a commit that referenced this pull request Jan 7, 2023
@sternenseemann
harfbuzz: remove unnecessary gobject-introspection from buildInputs
a566ac8 
Since #200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit that referenced this pull request Jan 7, 2023
@sternenseemann
pango: remove unnecessary gobject-introspection from buildInputs
113ef8c 
Since #200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit that referenced this pull request Jan 7, 2023
@sternenseemann
gdk-pixbuf: remove obsolete gobject-introspection from buildInputs
ef64104 
Since #200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit that referenced this pull request Jan 7, 2023
@sternenseemann
json-glib: remove unnecessary gobject-introspection from buildInputs
57c5eda 
Since #200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit that referenced this pull request Jan 7, 2023
@sternenseemann
libsoup: remove unnecessary gobject-introspection from buildInputs
42d56e4 
Since #200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit that referenced this pull request Jan 7, 2023
@sternenseemann
tracker: remove obsolete gobject-introspection from buildInputs
91acc7b 
Since #200337, it is propagated from nativeBuildInputs.
sternenseemann added a commit that referenced this pull request Jan 7, 2023
@sternenseemann
gtk3: remove obsolete gobject-introspection from buildInputs
80db805 
Since #200337, it is propagated from nativeBuildInputs.
sloane-shark pushed a commit to sloane-shark/nixpkgs that referenced this pull request Feb 17, 2023
@sternenseemann @sloane-shark
jre, temurin-bin: fix eval in pkgsCross.ghcjs.buildPackages
f219aeb 
Since NixOS#200337 gobject-introspection propagates itself via
depsTargetTargetPropagated, so one doesn't have to add it to every
derivation twice. The problem is that gobject-introspection still is in
a lot of buildInputs and will thus propagate itself again for target,
breaking evaluation unnecessarily if gobject-introspection doesn't
evaluate on whatever the target platform turns out to be.

temurin-bin and openjdk19 caused such a situation via gtk3 which GHC's
JavaScript backend depends on. To fix evaluation of those packages in
pkgsCross.ghcjs.buildPackages, we'll just disable the features pulling
in gtk3 until this is fixed properly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@dasj19 dasj19 Awaiting requested review from dasj19

@amaxine amaxine Awaiting requested review from amaxine

@lovek323 lovek323 Awaiting requested review from lovek323

@jtojnar jtojnar Awaiting requested review from jtojnar

@teto teto Awaiting requested review from teto

@cstrahan cstrahan Awaiting requested review from cstrahan

@hedning hedning Awaiting requested review from hedning

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 8.has: clean-up This PR removes packages or removes other cruft 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Artturin @vcunat