Skip to content

Comments

lots of cross fixes#189397

Merged
Artturin merged 7 commits intoNixOS:stagingfrom
Artturin:gobjectfunfixessplit
Sep 8, 2022
Merged

lots of cross fixes#189397
Artturin merged 7 commits intoNixOS:stagingfrom
Artturin:gobjectfunfixessplit

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Sep 2, 2022

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.

@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python Python is a high-level, general-purpose programming language. labels Sep 2, 2022
@Artturin Artturin changed the title fix lot of cross builds lots of cross fixes Sep 2, 2022
@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Sep 2, 2022
@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: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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 Sep 2, 2022
Mindavi
Mindavi reviewed Sep 2, 2022
View reviewed changes
pkgs/development/libraries/cogl/default.nix Outdated
Copy link
Contributor

@Mindavi Mindavi Sep 2, 2022

Choose a reason for hiding this comment

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

cc @lovek323

Mindavi
Mindavi reviewed Sep 2, 2022
View reviewed changes
pkgs/development/libraries/graphene/default.nix Outdated
Copy link
Contributor

@Mindavi Mindavi Sep 2, 2022

Choose a reason for hiding this comment

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

Sounds very hacky :)

Copy link
Member Author

@Artturin Artturin Sep 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

wonder why i did that instead of just making the installedTests conditional on host == build
changed it to that

Mindavi
Mindavi reviewed Sep 2, 2022
View reviewed changes
@Mindavi
Copy link
Contributor

Mindavi commented Sep 2, 2022

Thanks! Currently diff LGTM, but indeed some things should go upstream sooner rather than later. Do you want to track that somewhere or would the source of nixpkgs be enough to remember?

Sprinkled some small comments, nothing major.

@Artturin Artturin force-pushed the gobjectfunfixessplit branch 2 times, most recently from ced75a7 to a57e5de Compare September 2, 2022 13:13
@Artturin Artturin force-pushed the gobjectfunfixessplit branch 2 times, most recently from 41e0af9 to f813b1f Compare September 2, 2022 15:30
@Artturin
gnome-tour: work towards fixing cross
a32cd71 
doesn't work yet

```
gnome-tour-aarch64-unknown-linux-gnu> error: linking with `/nix/store/3d9zjv5vaqjxb9kwbdqsd194alwm97x1-gcc-wrapper-11.3.0/bin/cc` failed: exit status: 1
gnome-tour-aarch64-unknown-linux-gnu>   |
gnome-tour-aarch64-unknown-linux-gnu>   = note: "/nix/store/3d9zjv5vaqjxb9kwbdqsd194alwm97x1-gcc-wrapper-11.3.0/bin/cc" "-m64" "/build/rustcd8pO0A/symbols.o" "/build/gnome-tour-42.0/build/src/release/deps/gnome_to
...
gnome-tour-aarch64-unknown-linux-gnu>           /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: skipping incompatible /nix/store/c84gzzifyh10w9m612wxcas04r7fq4h0-glib-aarch64-unknown-linux-gnu-2.
72.3/lib/libglib-2.0.so when searching for -lglib-2.0
gnome-tour-aarch64-unknown-linux-gnu>           /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: cannot find -lglib-2.0: No such file or directory
...
gnome-tour-aarch64-unknown-linux-gnu>           collect2: error: ld returned 1 exit status
...
gnome-tour-aarch64-unknown-linux-gnu> FAILED: src/gnome-tour
gnome-tour-aarch64-unknown-linux-gnu> /nix/store/m5n32vy7rbfrqcxigw1p6wyx3cj7smg9-coreutils-9.1/bin/env CARGO_HOME=/build/gnome-tour-42.0/build/cargo-home /nix/store/76l9r44x1sv323c90j6vi401n4fvims2-cargo-1.62.1/b
in/cargo build --manifest-path /build/gnome-tour-42.0/Cargo.toml --target-dir /build/gnome-tour-42.0/build/src --release && cp src/release/gnome-tour src/gnome-tour
gnome-tour-aarch64-unknown-linux-gnu> ninja: build stopped: subcommand failed.
```
@Artturin Artturin force-pushed the gobjectfunfixessplit branch from f813b1f to 15cd209 Compare September 2, 2022 15:32
@Artturin Artturin marked this pull request as ready for review September 2, 2022 16:00
jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
pkgs/desktops/gnome/apps/gnome-logs/default.nix Outdated
Copy link
Member

@jtojnar jtojnar Sep 2, 2022

Choose a reason for hiding this comment

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

Should be here as well, do not rely on propagation: https://gitlab.gnome.org/GNOME/gnome-logs/-/blob/e0a8ab855f4ea318f2d2c5dfb1b314ac2702c987/meson.build#L64

jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
pkgs/desktops/gnome/apps/gnome-logs/default.nix Outdated
Copy link
Member

@jtojnar jtojnar Sep 2, 2022

Choose a reason for hiding this comment

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

Likely a remnant from porting from autotools: https://gitlab.gnome.org/GNOME/gnome-logs/-/blame/e0a8ab855f4ea318f2d2c5dfb1b314ac2702c987/meson.build#L56

Copy link
Member Author

@Artturin Artturin Sep 2, 2022

Choose a reason for hiding this comment

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

https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/47

Copy link
Member

@jtojnar jtojnar Sep 2, 2022

Choose a reason for hiding this comment

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

The extraneous mkenums check was removed in https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/37

Copy link
Member Author

@Artturin Artturin Sep 2, 2022

Choose a reason for hiding this comment

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

pulled both in patches

jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
pkgs/desktops/gnome/apps/gnome-characters/default.nix Outdated
Copy link
Member

@jtojnar jtojnar Sep 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

This should be fixed by adding native: true kwarg to find_program here:

https://gitlab.gnome.org/GNOME/gnome-characters/-/blob/b72bf4e1a7cbe8446ef2659d432b78ac8b50df83/src/meson.build#L2

Edit: that might not work looking at https://mesonbuild.com/Reference-manual_functions.html#find_program but it is definitely a native build input.

Copy link
Member Author

@Artturin Artturin Sep 2, 2022

Choose a reason for hiding this comment

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

find_program already looks in PATH

ther reason its needed in buildInputs is https://gitlab.gnome.org/GNOME/gnome-characters/-/blob/b72bf4e1a7cbe8446ef2659d432b78ac8b50df83/meson.build#L47

Copy link
Member

@jtojnar jtojnar Sep 2, 2022

Choose a reason for hiding this comment

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

buildInputs I am fine with since gjs is an interpreter used for running the app. But it should not be necessary at build time, as far as I can tell.

Copy link
Member Author

@Artturin Artturin Sep 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/82

and applied

jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
pkgs/desktops/gnome/apps/gnome-clocks/default.nix Outdated
Comment on lines +48 to +50
Copy link
Member

@jtojnar jtojnar Sep 2, 2022

Choose a reason for hiding this comment

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

Then it should be fixed there.

Copy link
Member Author

@Artturin Artturin Sep 2, 2022

Choose a reason for hiding this comment

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

yeah im going to do it in a separate pr

Copy link
Member Author

@Artturin Artturin Nov 15, 2023

Choose a reason for hiding this comment

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

#267550

jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
pkgs/development/libraries/libgnomekbd/default.nix Outdated
Copy link
Member

@jtojnar jtojnar Sep 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

We are switching to meson in #182618, we can probably cherry-pick that to master.

jtojnar
jtojnar reviewed Sep 2, 2022
View reviewed changes
@Artturin Artturin force-pushed the gobjectfunfixessplit branch 6 times, most recently from 2c9bff3 to 470e9ba Compare September 2, 2022 19:35
@teto
Copy link
Member

teto commented Sep 3, 2022

I won't/can't comment on the technical side but @Artturin I wonder what's your motivation for all these cross-building fixes ? It is great, just curious :)

@Artturin
Copy link
Member Author

Artturin commented Sep 7, 2022

I won't/can't comment on the technical side but @Artturin I wonder what's your motivation for all these cross-building fixes ? It is great, just curious :)

I want to see how much of nixpkgs we can get to cross-compile

@Artturin
treewide: cross fixes
da9a9a4
@Artturin
libgnomekbd: fix cross and build introspection data
a52d95a 
they weren't being built before at all
@Artturin
uhttpmock: fix cross
b59f013 
no idea why this still happens here when this issue was fixed in
gobject-introspection hook and the fix works for other packages
@Artturin Artturin force-pushed the gobjectfunfixessplit branch from 470e9ba to b59f013 Compare September 7, 2022 18:21
@Artturin Artturin merged commit 5fcc288 into NixOS:staging Sep 8, 2022
@Artturin Artturin deleted the gobjectfunfixessplit branch September 8, 2022 20:54
@Artturin Artturin mentioned this pull request Nov 14, 2023
Merged
13 tasks
uninsane added a commit to uninsane/nixpkgs that referenced this pull request Nov 22, 2023
@uninsane
vala: search for vapi files in targetOffset, not hostOffset
6990fa8 
this is in response to an old TODO:
<NixOS#189397 (comment)>
@uninsane uninsane mentioned this pull request Nov 22, 2023
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jtojnar jtojnar jtojnar left review comments

@Mindavi Mindavi Mindavi left review comments

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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.

4 participants

@Artturin @Mindavi @teto @jtojnar