[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
59/118: Install systemd and Upstart stuff only on Linux
From: |
Ludovic Courtès |
Subject: |
59/118: Install systemd and Upstart stuff only on Linux |
Date: |
Tue, 19 May 2015 14:45:40 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit de8be7c3e06b52c313e0b452b641ad5f90dca2fe
Author: Eelco Dolstra <address@hidden>
Date: Wed Jul 16 11:16:54 2014 +0200
Install systemd and Upstart stuff only on Linux
---
misc/systemd/local.mk | 6 +++++-
misc/upstart/local.mk | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/misc/systemd/local.mk b/misc/systemd/local.mk
index 5555818..004549f 100644
--- a/misc/systemd/local.mk
+++ b/misc/systemd/local.mk
@@ -1 +1,5 @@
-$(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call
install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))
+ifeq ($(OS), Linux)
+
+ $(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call
install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))
+
+endif
diff --git a/misc/upstart/local.mk b/misc/upstart/local.mk
index 249262d..a73dc06 100644
--- a/misc/upstart/local.mk
+++ b/misc/upstart/local.mk
@@ -1 +1,5 @@
-$(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n),
$(sysconfdir)/init, 0644)))
+ifeq ($(OS), Linux)
+
+ $(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n),
$(sysconfdir)/init, 0644)))
+
+endif
- 53/118: build-remote.pl: Fix build log, (continued)
- 53/118: build-remote.pl: Fix build log, Ludovic Courtès, 2015/05/19
- 66/118: nix-daemon: Show name of connecting user, Ludovic Courtès, 2015/05/19
- 58/118: Pass *_proxy vars to bootstrap fetchurl, Ludovic Courtès, 2015/05/19
- 56/118: Remove cruft, Ludovic Courtès, 2015/05/19
- 48/118: Fix broken Pid constructor, Ludovic Courtès, 2015/05/19
- 51/118: build-remote.pl: Use ‘nix-store --serve’ on the remote side, Ludovic Courtès, 2015/05/19
- 62/118: Be more strict about file names in NARs, Ludovic Courtès, 2015/05/19
- 65/118: nix-daemon: Only print connection info if we have SO_PEERCRED, Ludovic Courtès, 2015/05/19
- 72/118: Remove dead code, Ludovic Courtès, 2015/05/19
- 55/118: build-remote.pl: Fix building multiple output derivations, Ludovic Courtès, 2015/05/19
- 59/118: Install systemd and Upstart stuff only on Linux,
Ludovic Courtès <=
- 68/118: Ugly hack to fix building on old Darwin, Ludovic Courtès, 2015/05/19
- 64/118: nix-daemon: Fix compat with older clients, Ludovic Courtès, 2015/05/19
- 61/118: Handle case collisions on case-insensitive systems, Ludovic Courtès, 2015/05/19
- 60/118: Make dev-shell script work on Darwin, Ludovic Courtès, 2015/05/19
- 71/118: Revert old useBuildHook behaviour, Ludovic Courtès, 2015/05/19
- 63/118: Get rid of a compiler warning, Ludovic Courtès, 2015/05/19
- 67/118: nix-daemon: Add trusted-users and allowed-users options, Ludovic Courtès, 2015/05/19
- 70/118: Better fix for strcasecmp on Darwin, Ludovic Courtès, 2015/05/19
- 75/118: Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix, Ludovic Courtès, 2015/05/19
- 74/118: Merge commit '8e9140cfdef9dbd1eb61e4c75c91d452ab5e4a74' into nix, Ludovic Courtès, 2015/05/19