about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-08T11·51+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-08T11·51+0200
commit76cbf55a6d8953e393ba39896ccbb0948bac96d6 (patch)
tree676ba037317e0d3ba31af6fe134e59bfdd97ae51
parent89f923281335f695d4199e1fafaaeeb1729ba2d3 (diff)
Ensure that systemd units to into lib, not lib64
http://hydra.nixos.org/build/10170940
-rw-r--r--misc/systemd/local.mk2
-rw-r--r--nix.spec.in5
2 files changed, 4 insertions, 3 deletions
diff --git a/misc/systemd/local.mk b/misc/systemd/local.mk
index a5f6131ce878..5555818c5278 100644
--- a/misc/systemd/local.mk
+++ b/misc/systemd/local.mk
@@ -1 +1 @@
-$(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(libdir)/systemd/system, 0644)))
+$(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))
diff --git a/nix.spec.in b/nix.spec.in
index 1457308d1e0e..4ec8cfe65332 100644
--- a/nix.spec.in
+++ b/nix.spec.in
@@ -158,8 +158,8 @@ chgrp %{nixbld_group} /nix/store
 chmod 1775 /nix/store
 %if ! 0%{?rhel}
 # Enable and start Nix worker
-systemctl enable nix-daemon.service
-systemctl start  nix-daemon.service
+systemctl enable nix-daemon.socket nix-daemon.service
+systemctl start  nix-daemon.socket
 %endif
 
 %files
@@ -169,6 +169,7 @@ systemctl start  nix-daemon.service
 %exclude %dir %{perl_vendorarch}/auto/
 %{_prefix}/libexec/*
 %if ! 0%{?rhel}
+%{_prefix}/lib/systemd/system/nix-daemon.socket
 %{_prefix}/lib/systemd/system/nix-daemon.service
 %endif
 %{_datadir}/emacs/site-lisp/nix-mode.el