From ae6b631dc48f4b923a6ed17b8d6e59524c4ea883 Mon Sep 17 00:00:00 2001 From: Danny Wilson Date: Thu, 3 Apr 2014 16:59:25 +0200 Subject: [PATCH] Fix compile errors on Illumos --- src/libstore/build.cc | 1 + src/libstore/local.mk | 4 ++++ src/nix-daemon/local.mk | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 2e2f92fad..f38cd2994 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 2dddce740..40cb25dc5 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -10,6 +10,10 @@ libstore_LIBS = libutil libformat libstore_LDFLAGS = -lsqlite3 -lbz2 +ifeq ($(OS), SunOS) + libstore_LDFLAGS += -lsocket +endif + libstore_CXXFLAGS = \ -DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \ diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk index db071a3f7..bab84e7ad 100644 --- a/src/nix-daemon/local.mk +++ b/src/nix-daemon/local.mk @@ -6,4 +6,8 @@ nix-daemon_SOURCES := $(d)/nix-daemon.cc nix-daemon_LIBS = libmain libstore libutil libformat +ifeq ($(OS), SunOS) + nix-daemon_LDFLAGS += -lsocket +endif + $(eval $(call install-symlink, nix-daemon, $(bindir)/nix-worker))