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

flashrom: fix aarch64 build #97339

Merged
merged 1 commit into from Sep 8, 2020

Conversation

@petabyteboy
Copy link
Member

@petabyteboy petabyteboy commented Sep 7, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@petabyteboy
Copy link
Member Author

@petabyteboy petabyteboy commented Sep 7, 2020

CC @fpletz

@worldofpeace worldofpeace merged commit 6aeccf3 into NixOS:master Sep 8, 2020
19 checks passed
19 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
flashrom, flashrom.passthru.tests on aarch64-linux Success
Details
flashrom, flashrom.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7e0ff0"; rev="f7e0ff0f3533778154a9c08fc5073bc2fc9947fe"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7e0ff0"; rev="f7e0ff0f3533778154a9c08fc5073bc2fc9947fe"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7e0ff0"; rev="f7e0ff0f3533778154a9c08fc5073bc2fc9947fe"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7e0ff0"; rev="f7e0ff0f3533778154a9c08fc5073bc2fc9947fe"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7e0ff0"; rev="f7e0ff0f3533778154a9c08fc5073bc2fc9947fe"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7e0ff0"; rev="f7e0ff0f3533778154a9c08fc5073bc2fc9947fe"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7e0ff0"; rev="f7e0ff0f3533778154a9c08fc5073bc2fc9947fe"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Sep 8, 2020

Please also backport to 20.09 for ZHF

@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
};

mesonFlags = lib.optional stdenv.isAarch64 [ "-Dpciutils=false" ];

This comment has been minimized.

@vcunat

vcunat Sep 9, 2020
Member

Nitpick: I think this is better either as optionals or without the brackets.

This comment has been minimized.

@petabyteboy

petabyteboy Sep 9, 2020
Author Member

Thanks for the hint, I will use lib.optionals next time, but since this is already merged I think this cosmetical detail is not worth another commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.