Don't install systemd units unless using libsystemd session tracking.
Submitted upstream:
https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/134
diff --git a/data/meson.build b/data/meson.build
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,7 +26,7 @@ if enable_pam
)
endif
-if enable_logind
+if session_tracking == 'libsystemd-login'
configure_file(
input: 'polkit.service.in',
output: '@BASENAME@',
diff --git a/meson.build b/meson.build
--- a/meson.build
+++ b/meson.build
@@ -199,7 +199,7 @@ if enable_logind
# systemd unit / service files
systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
- if systemd_systemdsystemunitdir == ''
+ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
# FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
refslogtreecommitdiff
|
Age | Commit message (Expand) | Author |
2021-10-24 | etc: completion: Filter gratuitous spaces from available packages....Tested with:
guix environment --{ad-hoc,pure} zsh guix bash-completion coreutils -- zsh
% fpath=(~/guix/etc/completion/zsh $fpath)
% autoload -U compinit; compinit
* etc/completion/zsh/_guix (_guix_list_available_packages): Remove spaces.
Co-authored-by: Tobias Geerinckx-Rice <me@tobias.gr>
| Liliana Marie Prikler |
2021-08-28 | zsh completion: Add missing commands and arguments....* etc/completion/zsh/_guix (_guix_install, _guix_remove, _guix_upgrade):
New functions.
(_guix_build, _guix_challenge, _guix_download, _guix_environment,
_guix_packages, _guix_gc, _guix_hash, _guix_lint, _guix_package,
_guix_publish, _guix_pull, _guix_refresh, _guix_size, _guix_system):
Add some of the missing arguments.
(_guix_cmds): Add missing commands.
Co-authored-by: Brice Waegeneire <brice@waegenei.re>
| Noah Evans |
2021-02-17 | scripts: system: Remove 'vm-image' command....Remove the 'vm-image' command that has been superseded by the 'image'
command.
* gnu/system/vm.scm (system-qemu-image): Remove it.
* guix/scripts/system.scm (system-derivation-for-action): Mark 'vm-image'
command as deprecated and use the image API to produce the VM image.
(perform-action, show-help): Adapt accordingly.
* tests/guix-system.sh: Ditto.
* doc/guix.texi (Invoking guix system,
Running Guix in a VM): Ditto.
* etc/completion/fish/guix.fish: Ditto.
* etc/completion/zsh/_guix: Ditto.
| Mathieu Othacehe |