maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile errors on Illumos

Browse source
This commit is contained in:
Danny Wilson 2014-04-03 16:59:25 +02:00 • committed by Eelco Dolstra
parent daa16cca11
commit ae6b631dc4
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/build.cc
View file

@ -13,6 +13,7 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include <limits.h>
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/wait.h> #include <sys/wait.h>

4
src/libstore/local.mk
View file

@ -10,6 +10,10 @@ libstore_LIBS = libutil libformat
libstore_LDFLAGS = -lsqlite3 -lbz2 libstore_LDFLAGS = -lsqlite3 -lbz2
ifeq ($(OS), SunOS)
libstore_LDFLAGS += -lsocket
endif
libstore_CXXFLAGS = \ libstore_CXXFLAGS = \
-DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_STORE_DIR=\"$(storedir)\" \
-DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \

4
src/nix-daemon/local.mk
View file

@ -6,4 +6,8 @@ nix-daemon_SOURCES := $(d)/nix-daemon.cc
nix-daemon_LIBS = libmain libstore libutil libformat nix-daemon_LIBS = libmain libstore libutil libformat
ifeq ($(OS), SunOS)
nix-daemon_LDFLAGS += -lsocket
endif
$(eval $(call install-symlink, nix-daemon, $(bindir)/nix-worker)) $(eval $(call install-symlink, nix-daemon, $(bindir)/nix-worker))