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

systemd: systemd.pc: fix systemdsystemunitpath and systemduserunitpath #89441

Merged
merged 1 commit into from Jun 4, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jun 3, 2020

The paths in the generated systemd.pc were flipped, fix this:

systemdsystemunitpath: /nix/var/nix/profiles/default/lib/systemd/{user => system}
systemduserunitpath: /nix/var/nix/profiles/default/lib/systemd/{system => user}

The paths actually used in the code (further below in that patch) were
correct, so keep them there.

Motivation for this change

Fixes #59473.

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.

The paths in the generated `systemd.pc` were flipped, fix this:

`systemdsystemunitpath`: `/nix/var/nix/profiles/default/lib/systemd/{user => system}`
`systemduserunitpath`: `/nix/var/nix/profiles/default/lib/systemd/{system => user}`

The paths actually used in the code (further below in that patch) were
correct, so keep them there.

Fixes NixOS#59473.
@flokli
Copy link
Contributor Author

flokli commented Jun 3, 2020

@GrahamcOfBorg test systemd

@flokli flokli merged commit c5669b0 into NixOS:staging Jun 4, 2020
@flokli flokli deleted the systemd-systemd.pc-system-user branch June 4, 2020 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants