Skip to content

Fix installing check-for-firmware-updates files in NixOS#74

Merged
lenemter merged 1 commit intomasterfrom
bobby285271/fix-nixos
Jul 25, 2023
Merged

Fix installing check-for-firmware-updates files in NixOS#74
lenemter merged 1 commit intomasterfrom
bobby285271/fix-nixos

Conversation

@bobby285271
Copy link
Copy Markdown
Member

@bobby285271 bobby285271 commented Jul 22, 2023

(review with hide whitespace)

As a weird distro, we install packages in their own separate prefixes, which means we don't have /usr/bin/busctl, and we cannot install files to systemd's prefix.

(I can kill the busctlpath meson options if preferred, since we are not using find_program I assume cross compilation should be fine here?)

$ find | grep check-for-firmware-updates       
./lib/systemd/system/io.elementary.settings-daemon.check-for-firmware-updates.service
./lib/systemd/system/io.elementary.settings-daemon.check-for-firmware-updates.timer

$ cat ./lib/systemd/system/io.elementary.settings-daemon.check-for-firmware-updates.service | grep ExecStart
ExecStart=/nix/store/lhpz4ywr4dhbcxx688piqa7cv6vh15fd-systemd-253.5/bin/busctl --user call io.elementary.settings-daemon /io/elementary/settings_daemon org.freedesktop.Application ActivateAction sava{sv} "check-firmware-updates" 0 0

@danirabbit danirabbit requested a review from a team July 22, 2023 15:06
Copy link
Copy Markdown
Member

@lenemter lenemter left a comment

Choose a reason for hiding this comment

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

get_pkgconfig_variable is deprecated, we should use get_variable now.

Comment thread data/meson.build Outdated
Comment thread data/meson.build Outdated
@lenemter lenemter mentioned this pull request Jul 25, 2023
As a weird distro, we install packages in their own separate prefixes,
which means we don't have /usr/bin/busctl, and we cannot install files
to systemd's prefix.
@bobby285271 bobby285271 force-pushed the bobby285271/fix-nixos branch from c52f57e to d4e65a6 Compare July 25, 2023 05:14
@bobby285271 bobby285271 requested a review from lenemter July 25, 2023 05:18
Copy link
Copy Markdown
Member

@lenemter lenemter left a comment

Choose a reason for hiding this comment

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

Looks good and works same as master in elementary OS.

@lenemter lenemter merged commit cb78b39 into master Jul 25, 2023
@lenemter lenemter deleted the bobby285271/fix-nixos branch July 25, 2023 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

2 participants