diff options
| author | Danny Wilson <danny@decube.net> | 2014-04-03T14·59+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-03T15·39+0200 |
| commit | ae6b631dc48f4b923a6ed17b8d6e59524c4ea883 (patch) | |
| tree | 482258382b5ecfc05127734ffb9f36b5db2aeac6 | |
| parent | daa16cca11304a0e91a188176959e2af28be1f57 (diff) | |
Fix compile errors on Illumos
| -rw-r--r-- | src/libstore/build.cc | 1 | ||||
| -rw-r--r-- | src/libstore/local.mk | 4 | ||||
| -rw-r--r-- | src/nix-daemon/local.mk | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 2e2f92fadf..f38cd29940 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -13,6 +13,7 @@ #include <sstream> #include <algorithm> +#include <limits.h> #include <time.h> #include <sys/time.h> #include <sys/wait.h> diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 2dddce740d..40cb25dc5f 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 db071a3f7c..bab84e7add 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)) |