From 76cbf55a6d8953e393ba39896ccbb0948bac96d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Apr 2014 13:51:34 +0200 Subject: [PATCH] Ensure that systemd units to into lib, not lib64 http://hydra.nixos.org/build/10170940 --- misc/systemd/local.mk | 2 +- nix.spec.in | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/misc/systemd/local.mk b/misc/systemd/local.mk index a5f6131c..5555818c 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 1457308d..4ec8cfe6 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