diff options
| author | Florian Klink <flokli@flokli.de> | 2020-05-21 20:22:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 20:22:26 +0200 |
| commit | 927b7795cbaf1ee045f2def83bb455cf7e8b75c4 (patch) | |
| tree | 5b80984cf59725382b714ffe64905b49b99fff51 /pkgs/tools | |
| parent | 4f6cd4f6c6f3ae16bdc4dfb6830a446856d3f783 (diff) | |
| parent | d69f95e2fe4f7fe157539ad8312c73390d456688 (diff) | |
| download | nixlib-927b7795cbaf1ee045f2def83bb455cf7e8b75c4.tar nixlib-927b7795cbaf1ee045f2def83bb455cf7e8b75c4.tar.gz nixlib-927b7795cbaf1ee045f2def83bb455cf7e8b75c4.tar.bz2 nixlib-927b7795cbaf1ee045f2def83bb455cf7e8b75c4.tar.lz nixlib-927b7795cbaf1ee045f2def83bb455cf7e8b75c4.tar.xz nixlib-927b7795cbaf1ee045f2def83bb455cf7e8b75c4.tar.zst nixlib-927b7795cbaf1ee045f2def83bb455cf7e8b75c4.zip | |
Merge pull request #88492 from flokli/current-system-systemctl
tree-wide: use systemctl of running system
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/virtualization/google-compute-engine/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 03827d75905d..b2bbb161f289 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -34,7 +34,7 @@ in SYSTEMD_UNIT_DIR=/lib/systemd/system \ UDEV_RULES_DIR=/etc/udev/rules.d substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin/systemctl "${systemd}/bin/systemctl" + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" '' else '' make install TARGETS='pmutils' DESTDIR=$out \ PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 48255ca68a73..34f2bc9e1909 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { postPatch = '' for file in $(find google_compute_engine -type f); do substituteInPlace "$file" \ - --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \ + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \ --replace /bin/bash "${bashInteractive}/bin/bash" \ --replace /sbin/hwclock "${utillinux}/bin/hwclock" # SELinux tool ??? /sbin/restorecon |