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

fwupd: fix cross compilation #367009

Merged
merged 1 commit into from
Dec 22, 2024
Merged

fwupd: fix cross compilation #367009

merged 1 commit into from
Dec 22, 2024

Conversation

jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Dec 21, 2024

Valgrind is a runtime dependency, so it needs to be in buildInputs.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Valgrind is a runtime dependency, so it needs to be in `buildInputs`.
@jmbaur jmbaur requested a review from r-vdp December 21, 2024 05:20
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Dec 21, 2024
@r-vdp
Copy link
Contributor

r-vdp commented Dec 21, 2024

@ofborg build fwupd fwupd.tests pkgsCross.aarch64-multiplatform.fwupd

@misuzu misuzu added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Dec 21, 2024
@r-vdp
Copy link
Contributor

r-vdp commented Dec 21, 2024

@ofborg build fwupd fwupd.tests

Copy link
Contributor

@misuzu misuzu left a comment

Choose a reason for hiding this comment

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

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 367009


x86_64-linux

❌ 1 package failed to build:
  • libsForQt5.discover (plasma5Packages.discover)
✅ 26 packages built:
  • fwupd
  • fwupd.debug
  • fwupd.dev
  • fwupd.devdoc
  • fwupd.installedTests
  • fwupd.lib
  • fwupd.man
  • gnome-firmware
  • gnome-software
  • kdePackages.discover
  • kdePackages.discover.debug
  • kdePackages.discover.dev
  • kdePackages.discover.devtools
  • libsForQt5.kinfocenter (plasma5Packages.kinfocenter)
  • pantheon.elementary-greeter
  • pantheon.elementary-onboarding
  • pantheon.elementary-settings-daemon
  • pantheon.switchboard-plug-about
  • pantheon.switchboard-plug-pantheon-shell
  • pantheon.switchboard-plug-power
  • pantheon.switchboard-plug-security-privacy
  • pantheon.switchboard-with-plugs
  • pantheon.wingpanel-applications-menu
  • pantheon.wingpanel-indicator-power
  • pantheon.wingpanel-quick-settings
  • pantheon.wingpanel-with-indicators

libsForQt5.discover is already broken https://hydra.nixos.org/build/281464945

Fixes pkgsCross.aarch64-multiplatform.fwupd

@misuzu misuzu merged commit 592c26c into NixOS:master Dec 22, 2024
47 of 50 checks passed
@r-vdp
Copy link
Contributor

r-vdp commented Dec 22, 2024

It's annoying that the macos build from ofborg fails because of the nixos test, I think we should probably include that test in passthru for linux only.

@jmbaur jmbaur deleted the fwupd-cross branch December 22, 2024 15:01
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: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants