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: wrap programs needed in PATH #65825

Merged
merged 1 commit into from Aug 5, 2019

Conversation

@worldofpeace
Copy link
Member

commented Aug 3, 2019

Motivation for this change

Should fix #65658. I we dislike this approach we could add entries to PATH with the wrapper.

Edit: let's do that

cc @baracoder @tadfisher

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
@baracoder

This comment has been minimized.

Copy link
Contributor

commented Aug 3, 2019

I've checked out this branch and performed a rebuild switch, unfortunately fwupd does fail with segmentation fault

● fwupd.service - Firmware update daemon
   Loaded: loaded (/nix/store/25fnylavzacwnzi4d1p91rf7hgvp6dgd-fwupd-1.2.8/lib/systemd/system/fwupd.service; linked; vendor preset: enabled)
   Active: failed (Result: signal) since Sat 2019-08-03 13:39:11 CEST; 16s ago
     Docs: https://fwupd.org/
  Process: 13705 ExecStart=/nix/store/25fnylavzacwnzi4d1p91rf7hgvp6dgd-fwupd-1.2.8/libexec/fwupd/fwupd (code=killed, signal=SEGV)
 Main PID: 13705 (code=killed, signal=SEGV)

Aug 03 13:39:11 hex systemd[1]: Starting Firmware update daemon...
Aug 03 13:39:11 hex systemd[1]: fwupd.service: Main process exited, code=killed, status=11/SEGV
Aug 03 13:39:11 hex systemd[1]: fwupd.service: Failed with result 'signal'.
Aug 03 13:39:11 hex systemd[1]: Failed to start Firmware update daemon.

@worldofpeace worldofpeace force-pushed the worldofpeace:fwupd-fix-patch branch from 1ebc9af to f45a34a Aug 3, 2019

@worldofpeace worldofpeace changed the title fwupd: correct hardcode patch fwupd: wrap programs needed in PATH Aug 3, 2019

@worldofpeace

This comment has been minimized.

Copy link
Member Author

commented Aug 3, 2019

@baracoder How about now?

@baracoder

This comment has been minimized.

Copy link
Contributor

commented Aug 5, 2019

@worldofpeace sorry for the delay. It works with the new changes. (Writing from a successfully updated laptop)

@worldofpeace

This comment has been minimized.

Copy link
Member Author

commented Aug 5, 2019

Thank you @baracoder for testing 👍

@worldofpeace worldofpeace merged commit c91f362 into NixOS:master Aug 5, 2019

14 of 16 checks passed

fwupd on aarch64-linux No attempt
Details
fwupd on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
fwupd 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="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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 worldofpeace deleted the worldofpeace:fwupd-fix-patch branch Aug 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.