diff options
| author | Arian van Putten <arian.vanputten@gmail.com> | 2020-10-02 13:59:12 +0200 |
|---|---|---|
| committer | Arian van Putten <arian.vanputten@gmail.com> | 2020-10-02 14:00:40 +0200 |
| commit | 353fb8de7c86c39403c4682afcffa349916fe451 (patch) | |
| tree | 7a8677e5382b9628490c460189bbe28ef14e58e4 | |
| parent | Merge pull request #99256 from Ma27/sudo-pkg-option (diff) | |
| download | nixpkgs-353fb8de7c86c39403c4682afcffa349916fe451.tar.gz | |
systemd: set rootprefix to /run/current-system/systemd
sd_path_lookup_* returns $rootprefix, which was making a cyclic
dependency to $out and $lib
We also patch systemd in ./0014-add-rootprefix-to-lookup-dir-paths.patch
to look for all config files (except unit files; they have their
own lookup path logic) in rootprefix. This will keep working
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 54060b156f26..99980c6a59da 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation { "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services" "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" "-Dpamconfdir=${placeholder "out"}/etc/pam.d" - "-Drootprefix=${placeholder "out"}" + "-Drootprefix=/run/current-system/systemd" "-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig" "-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig" "-Dloadkeys-path=${kbd}/bin/loadkeys" |