summary refs log tree commit diff
path: root/pkgs/development/libraries/libvirt
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-07-08 13:00:16 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-07-08 18:56:01 +0200
commit1837136c7b5243b8f6677fe159f9ec2854036176 (patch)
tree4cc7f5eb9fb59e65ac4264bc72104e105434bcb7 /pkgs/development/libraries/libvirt
parent564dec2f71c3c4dbe07bbea2f7564a521919136a (diff)
downloadnixpkgs-1837136c7b5243b8f6677fe159f9ec2854036176.tar
nixpkgs-1837136c7b5243b8f6677fe159f9ec2854036176.tar.gz
nixpkgs-1837136c7b5243b8f6677fe159f9ec2854036176.tar.bz2
nixpkgs-1837136c7b5243b8f6677fe159f9ec2854036176.tar.lz
nixpkgs-1837136c7b5243b8f6677fe159f9ec2854036176.tar.xz
nixpkgs-1837136c7b5243b8f6677fe159f9ec2854036176.tar.zst
nixpkgs-1837136c7b5243b8f6677fe159f9ec2854036176.zip
libvirt: use /run for runstatedir
systemd complains:

	Jul 08 12:43:59 kaiser systemd[1]: /nix/store/bvfikb8v9m646m23fqm0rfnnsj6plc2k-libvirt-6.2.0/lib/systemd/system/libvirtd-admin.socket:11: ListenStream= references a path below legacy directory /var/run/, updating /var/run/libvirt/libvirt-admin-sock → /run/libvirt/libvirt-admin-sock; please update the unit file accordingly.
	Jul 08 12:43:59 kaiser systemd[1]: /nix/store/bvfikb8v9m646m23fqm0rfnnsj6plc2k-libvirt-6.2.0/lib/systemd/system/libvirtd-ro.socket:11: ListenStream= references a path below legacy directory /var/run/, updating /var/run/libvirt/libvirt-sock-ro → /run/libvirt/libvirt-sock-ro; please update the unit file accordingly.
	Jul 08 12:43:59 kaiser systemd[1]: /nix/store/bvfikb8v9m646m23fqm0rfnnsj6plc2k-libvirt-6.2.0/lib/systemd/system/libvirtd.socket:9: ListenStream= references a path below legacy directory /var/run/, updating /var/run/libvirt/libvirt-sock → /run/libvirt/libvirt-sock; please update the unit file accordingly.

Let's just set it correctly manually, that is what Red Hat does:

https://gitlab.com/libvirt/libvirt/-/commit/ba7592f6c17d50435582e597727fbfc51322d606

See also:

https://gitlab.com/libvirt/libvirt/-/commit/390997925a3aca1b57969526c3e083761fafe7c3
Diffstat (limited to 'pkgs/development/libraries/libvirt')
-rw-r--r--pkgs/development/libraries/libvirt/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9f8a617c6a0..27f345a9c83 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -65,6 +65,7 @@ in stdenv.mkDerivation rec {
   dontAddDisableDepTrack = true;
 
   configureFlags = [
+    "--with-runstatedir=/run" # TODO: remove when autoconf 1.70 is released
     "--localstatedir=/var"
     "--sysconfdir=/var/lib"
     "--with-libpcap"
@@ -97,6 +98,7 @@ in stdenv.mkDerivation rec {
   ];
 
   installFlags = [
+    "runstatedir=${placeholder "out"}/run"
     "localstatedir=$(TMPDIR)/var"
     "sysconfdir=$(out)/var/lib"
   ];