aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSander van der Burg <s.vanderburg@tudelft.nl>2009-10-08 14:50:37 +0000
committerSander van der Burg <s.vanderburg@tudelft.nl>2009-10-08 14:50:37 +0000
commit53a4981fa28a9f13758554b643c06e871ede8dbd (patch)
tree0a3aa72306d7c6882483ef920f7c055b5b9f1069 /src
parent18f0ff003d711f88a8682131108b101debec3737 (diff)
Added optional parameter which adds -lnsl -lsocket to make the Nix package manager work on OpenSolaris
Diffstat (limited to 'src')
-rw-r--r--src/libstore/Makefile.am2
-rw-r--r--src/nix-env/Makefile.am2
-rw-r--r--src/nix-hash/Makefile.am2
-rw-r--r--src/nix-instantiate/Makefile.am2
-rw-r--r--src/nix-store/Makefile.am2
-rw-r--r--src/nix-worker/Makefile.am2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index 903778780..185bb298d 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -10,7 +10,7 @@ pkginclude_HEADERS = \
globals.hh db.hh references.hh pathlocks.hh \
worker-protocol.hh
-libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la
+libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@
BUILT_SOURCES = derivations-ast.cc derivations-ast.hh
diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am
index 4720dfe8b..dfc10cd5d 100644
--- a/src/nix-env/Makefile.am
+++ b/src/nix-env/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = nix-env
nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh help.txt
nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
nix-env.o: help.txt.hh
diff --git a/src/nix-hash/Makefile.am b/src/nix-hash/Makefile.am
index 1c7eee332..d1d55ad29 100644
--- a/src/nix-hash/Makefile.am
+++ b/src/nix-hash/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-hash
nix_hash_SOURCES = nix-hash.cc help.txt
nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
nix-hash.o: help.txt.hh
diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am
index 6e42c4fa0..e0f1adbb9 100644
--- a/src/nix-instantiate/Makefile.am
+++ b/src/nix-instantiate/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = nix-instantiate
nix_instantiate_SOURCES = nix-instantiate.cc help.txt
nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
nix-instantiate.o: help.txt.hh
diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am
index 1a07bcbb3..2b43b19b0 100644
--- a/src/nix-store/Makefile.am
+++ b/src/nix-store/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-store
nix_store_SOURCES = nix-store.cc dotgraph.cc dotgraph.hh help.txt
nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
nix-store.o: help.txt.hh
diff --git a/src/nix-worker/Makefile.am b/src/nix-worker/Makefile.am
index f6106450b..456fe28af 100644
--- a/src/nix-worker/Makefile.am
+++ b/src/nix-worker/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-worker
nix_worker_SOURCES = nix-worker.cc help.txt
nix_worker_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
nix-worker.o: help.txt.hh