lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Ensure that systemd units to into lib, not lib64

Browse source 
http://hydra.nixos.org/build/10170940
This commit is contained in:
Eelco Dolstra 2014-04-08 13:51:34 +02:00
parent 89f9232813
commit 76cbf55a6d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
misc/systemd/local.mk
View file

@ -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)))

5
nix.spec.in
View file

@ -158,8 +158,8 @@ chgrp %{nixbld_group} /nix/store
chmod 1775 /nix/store chmod 1775 /nix/store
%if ! 0%{?rhel} %if ! 0%{?rhel}
# Enable and start Nix worker # Enable and start Nix worker
systemctl enable nix-daemon.service systemctl enable nix-daemon.socket nix-daemon.service
systemctl start nix-daemon.service systemctl start nix-daemon.socket
%endif %endif
%files %files
@ -169,6 +169,7 @@ systemctl start nix-daemon.service
%exclude %dir %{perl_vendorarch}/auto/ %exclude %dir %{perl_vendorarch}/auto/
%{_prefix}/libexec/* %{_prefix}/libexec/*
%if ! 0%{?rhel} %if ! 0%{?rhel}
%{_prefix}/lib/systemd/system/nix-daemon.socket
%{_prefix}/lib/systemd/system/nix-daemon.service %{_prefix}/lib/systemd/system/nix-daemon.service
%endif %endif
%{_datadir}/emacs/site-lisp/nix-mode.el %{_datadir}/emacs/site-lisp/nix-mode.el