Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gtkgreet: fix cross-compilation #351481

Merged
merged 1 commit into from
Oct 27, 2024
Merged

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Oct 26, 2024

A problem -- gtkgreet build against target scdoc, instead of build.
I tried to modify meson.build, switch scdoc to be native dependency, but it didn't work, because meson need_build_ pkg-config to find it, and NixOS' meson provided with target configured pkg-config.

So I decided disable manpage generation in case of cross, and build it "manually" in postInstall.

Proper fix submitted

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@avnik
Copy link
Contributor Author

avnik commented Oct 26, 2024

Would be nice, if someone offer better solution

@avnik avnik added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Oct 26, 2024
@avnik avnik marked this pull request as draft October 26, 2024 19:00
@ofborg ofborg bot requested a review from luc65r October 26, 2024 19:47
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Oct 26, 2024
@avnik avnik force-pushed the avnik/gtkgreet-cross-fix branch from 1e05ff5 to b62e4a1 Compare October 26, 2024 22:49
Signed-off-by: Alexander V. Nikolaev <[email protected]>
@avnik avnik force-pushed the avnik/gtkgreet-cross-fix branch from b62e4a1 to 5b5e9be Compare October 27, 2024 09:28
@avnik avnik marked this pull request as ready for review October 27, 2024 09:30
@Mindavi Mindavi merged commit ae9f64a into NixOS:master Oct 27, 2024
26 checks passed
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 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants