Skip to content

cross fixes#223142

Merged
Artturin merged 10 commits intoNixOS:masterfrom
Artturin:crossfixes6
Apr 6, 2023
Merged

cross fixes#223142
Artturin merged 10 commits intoNixOS:masterfrom
Artturin:crossfixes6

Conversation

@Artturin
Copy link
Copy Markdown
Member

fix cross

checked with diffing###### 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/)
  • 23.05 Release Notes (or backporting 22.11 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
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Mar 25, 2023
@ofborg ofborg bot requested a review from manveru March 25, 2023 22:36
@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. labels Mar 25, 2023
@ofborg ofborg bot requested a review from jtojnar March 25, 2023 22:45
@Artturin Artturin changed the title appstream: enable strictDeps cross fixes Mar 25, 2023
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Mar 25, 2023
@ofborg ofborg bot requested review from amaxine, bobby285271, dasj19 and hedning March 25, 2023 23:26
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 26, 2023
@NickCao
Copy link
Copy Markdown
Member

NickCao commented Mar 26, 2023

For gupnp and gssdp, see #221308

@Artturin Artturin force-pushed the crossfixes6 branch 2 times, most recently from a080cb2 to 9d0a433 Compare March 26, 2023 14:14
@Artturin Artturin force-pushed the crossfixes6 branch 3 times, most recently from c31ac12 to 29010f4 Compare March 26, 2023 14:26
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 26, 2023
Copy link
Copy Markdown
Contributor

@uninsane uninsane Mar 27, 2023

Choose a reason for hiding this comment

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

alternative to hardcoding iconv-detect.h you can invoke the emulator:

 "$CC" ./iconv-detect.c -o iconv-detect
 ${stdenv.hostPlatform.emulator buildPackages} ./iconv-detect
 rm iconv-detect

i think this would save you from adding platform-specific (musl-specific) logic.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

there's no special emulator for musl so it won't work

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can't we make it so that if stdenv.buildPlatform.canExecute stdenv.hostPlatform, the dummy emulator (shell) is called.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

it already does that

@lovesegfault lovesegfault self-requested a review March 28, 2023 11:28
@Artturin Artturin force-pushed the crossfixes6 branch 2 times, most recently from b857a43 to 479f4a8 Compare March 31, 2023 13:55
Artturin added 3 commits April 2, 2023 05:50
fix cross

cogl propagates gobject-introspection to buildInputs so thats why it has been working
so far

checked with diffing
fix cross

checked with diffing
fix cross

checked with diffing
@Artturin Artturin marked this pull request as ready for review April 2, 2023 02:51
@Artturin Artturin requested review from Mindavi, NickCao and uninsane April 2, 2023 02:52
@Artturin Artturin merged commit 06c63bc into NixOS:master Apr 6, 2023
@Artturin Artturin deleted the crossfixes6 branch April 6, 2023 20:09
uninsane added a commit to uninsane/nixpkgs that referenced this pull request Apr 7, 2023
librest_1_0 supports cross compilation (in staging: NixOS#223142),
but the old 0.8 version still doesn't. unlike 1.0 -- which builds with
meson -- librest 0.8 uses autotools with no obvious way to tell
`configure` to use the native gtk-doc, so just skip docs for cross
builds of this older version.
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 6.topic: GNOME GNOME desktop environment and its underlying platform 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants