[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
- 38/64: Fix test evaluation, (continued)
- 38/64: Fix test evaluation, Ludovic Courtès, 2015/01/05
- 34/64: Add docbook icons to the distribution, Ludovic Courtès, 2015/01/05
- 37/64: Bump date, Ludovic Courtès, 2015/01/05
- 39/64: nix-env: Minor change to '--delete-generations Nd' semantics, Ludovic Courtès, 2015/01/05
- 33/64: If a .drv cannot be parsed, show its path, Ludovic Courtès, 2015/01/05
- 40/64: trunk -> master, Ludovic Courtès, 2015/01/05
- 17/64: Pass position information to primop calls, Ludovic Courtès, 2015/01/05
- 32/64: Simplify quick start section, Ludovic Courtès, 2015/01/05
- 43/64: Set build-max-jobs to the number of available cores by default, Ludovic Courtès, 2015/01/05
- 41/64: doc fix: swap 'import' and 'export', Ludovic Courtès, 2015/01/05
- 28/64: Ensure that systemd units to into lib, not lib64,
Ludovic Courtès <=
- 36/64: Bump version to 1.8, Ludovic Courtès, 2015/01/05
- 44/64: Install an Upstart service, Ludovic Courtès, 2015/01/05
- 45/64: Set up directories and permissions for multi-user install automatically, Ludovic Courtès, 2015/01/05
- 46/64: Simplify multi-user installation instructions, Ludovic Courtès, 2015/01/05
- 49/64: Add ubuntu 14.04, Ludovic Courtès, 2015/01/05
- 48/64: Don't install Upstart job on Fedora, Ludovic Courtès, 2015/01/05
- 51/64: Really fix the RPM builds, Ludovic Courtès, 2015/01/05
- 50/64: Fix RPM build, Ludovic Courtès, 2015/01/05
- 53/64: fix typo, Ludovic Courtès, 2015/01/05
- 52/64: Shortcut already-hardlinked files, Ludovic Courtès, 2015/01/05