guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

28/64: Ensure that systemd units to into lib, not lib64


From: Ludovic Courtès
Subject: 28/64: Ensure that systemd units to into lib, not lib64
Date: Mon, 05 Jan 2015 16:38:59 +0000

civodul pushed a commit to branch nix
in repository guix.

commit 76cbf55a6d8953e393ba39896ccbb0948bac96d6
Author: Eelco Dolstra <address@hidden>
Date:   Tue Apr 8 13:51:34 2014 +0200

    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 a5f6131..5555818 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 1457308..4ec8cfe 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]