Skip to content

glib: fix cross compile#200760

Merged
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
squalus:glib-cross
Nov 12, 2022
Merged

glib: fix cross compile#200760
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
squalus:glib-cross

Conversation

@squalus
Copy link
Member

@squalus squalus commented Nov 11, 2022

Description of changes

Made libxslt an unconditional input. It's used for building man pages, which are enabled on cross builds.

The cross build was broken since 0b5be61.

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.

@squalus
glib: fix cross compile
e9c35f1 
Made libxslt an unconditional input. It's used for building man pages,
which are enabled on cross builds.
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Nov 11, 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: 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. labels Nov 11, 2022
@squalus squalus requested a review from Mindavi November 11, 2022 22:09
jtojnar
jtojnar approved these changes Nov 11, 2022
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

I must have incorrectly assumed that man page was conditional on buildDocs.

@SuperSandro2000 SuperSandro2000 merged commit 871cf0d into NixOS:staging Nov 12, 2022
@jtojnar jtojnar mentioned this pull request Nov 13, 2022
Merged
13 tasks
@bobby285271 bobby285271 mentioned this pull request Nov 15, 2022
Closed
13 tasks
@delroth delroth mentioned this pull request Nov 18, 2022
Merged
@NickCao NickCao mentioned this pull request Nov 20, 2022
Closed
@github-actions github-actions bot mentioned this pull request Nov 21, 2022
Merged
1 task
@github-actions
Copy link
Contributor

github-actions bot commented Nov 21, 2022

Successfully created backport PR #202257 for staging-22.11.

@jtojnar jtojnar mentioned this pull request Dec 3, 2022
Closed
15 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jtojnar jtojnar jtojnar approved these changes

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@lovek323 lovek323 Awaiting requested review from lovek323

@dasj19 dasj19 Awaiting requested review from dasj19

@amaxine amaxine Awaiting requested review from amaxine

@hedning hedning Awaiting requested review from hedning

@Mindavi Mindavi Awaiting requested review from Mindavi

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 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.

4 participants

@squalus @jtojnar @SuperSandro2000 @Mindavi