diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 00:53:51 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:05:53 +0100 |
| commit | e5ded57aabe97617a7ca2b67494cdbc1d0fdedba (patch) | |
| tree | e9fea4f18b57e1bf83a4e587a09ec831729be321 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 4db0860814e820212fedd78ae08ba9998f2e0a3a (diff) | |
| download | nixpkgs-e5ded57aabe97617a7ca2b67494cdbc1d0fdedba.tar nixpkgs-e5ded57aabe97617a7ca2b67494cdbc1d0fdedba.tar.gz nixpkgs-e5ded57aabe97617a7ca2b67494cdbc1d0fdedba.tar.bz2 nixpkgs-e5ded57aabe97617a7ca2b67494cdbc1d0fdedba.tar.lz nixpkgs-e5ded57aabe97617a7ca2b67494cdbc1d0fdedba.tar.xz nixpkgs-e5ded57aabe97617a7ca2b67494cdbc1d0fdedba.tar.zst nixpkgs-e5ded57aabe97617a7ca2b67494cdbc1d0fdedba.zip | |
treewide: NIX_CFLAGS_COMPILE -> string
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3cc976a909d..3462801c07c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -180,18 +180,18 @@ in stdenv.mkDerivation { --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + NIX_CFLAGS_COMPILE = toString [ + # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ]; + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; doCheck = false; # fails a bunch of tests |