nix: builds (fyi: still won't work)

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Sat Aug 1 20:05:56 2020 +0200
Changeset:	3a4836a022d7660585213de3f6914dbd464918e8

Modified Files:
	nix/Makefile
	nix/PLIST
	nix/TODO

Log Message:
nix: builds (fyi: still won't work)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3a4836a022d7660585213de3f6914dbd464918e8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nix/Makefile | 16 ++++++----
 nix/PLIST    | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nix/TODO     | 29 ------------------
 3 files changed, 108 insertions(+), 35 deletions(-)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index a3fed5be9c..1123bd6cf7 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -30,20 +30,22 @@ CONFIGURE_ARGS+=	--enable-gc
 # left unchanged.
 CONFIGURE_ENV+=		ac_cv_header_aws_s3_S3Client_h=no
 #CONFIGURE_ENV+=	EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
-#CONFIGURE_ENV+=	EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
-#CONFIGURE_ENV+=	EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include/readline
+#CONFIGURE_ENV+=	EDITLINE_LIBS=-L${BUILDLINK_PREFIX.editlinereadline:Q}/lib
+#CONFIGURE_ENV+=	EDITLINE_CFLAGS=-I${BUILDLINK_PREFIX.editlinereadline:Q}/include/readline
 CONFIGURE_ENV+=		EDITLINE_CFLAGS="-DREADLINE"
-CONFIGURE_ENV+=		EDITLINE_LIBS=-L${BUILDLINK_PREFIX.editlinereadline:Q}/lib
+CONFIGURE_ENV+=		EDITLINE_LIBS="-ledit -L${BUILDLINK_PREFIX.editlinereadline:Q}/lib"
 #CONFIGURE_ENV+=	EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editline:Q}/include/readline
 #CONFIGURE_ENV+=	EDITLINE_LIBS=${BUILDLINK_PREFIX.editline:Q}/lib
-CONFIGURE_ENV+=		LIBLZMA_CFLAGS="-I${BUILDLINK_PREFIX.lzmalib:Q}/include"
-CONFIGURE_ENV+=		LIBLZMA_LIBS="-llzma -L${BUILDLINK_PREFIX.lzmalib:Q}/lib"
+#CONFIGURE_ENV+=		LIBLZMA_CFLAGS="-I${BUILDLINK_PREFIX.xz:Q}/include"
+#CONFIGURE_ENV+=		LIBLZMA_LIBS="-llzma -L${BUILDLINK_PREFIX.xz:Q}/lib"
 CONFIGURE_ENV+=		BOOST_ROOT=${BUILDLINK_PREFIX.boost:Q}/lib
 
 # Workaround for:
 #   /usr/bin/ld: error: undefined symbol: SHA512_Update
 MAKE_ARGS+=	libutil_ALLOW_UNDEFINED=yes
 
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
+
 # verbose build
 MAKE_ENV+=	V=1
 # Disable hardcoded -O3
@@ -94,7 +96,9 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 pre-configure:
 	cd ${WRKSRC} && ${SH} bootstrap.sh
 
-.include "../../archivers/lzmalib/buildlink3.mk"
+#.include "../../archivers/lzmalib/buildlink3.mk"
+#.include "../../mk/dlopen.buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
 .include "../../archivers/brotli/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/nix/PLIST b/nix/PLIST
index 48d96a5493..56bafc9ee3 100644
--- a/nix/PLIST
+++ b/nix/PLIST
@@ -1 +1,99 @@
 @comment $NetBSD$
+bin/nix
+bin/nix-build
+bin/nix-channel
+bin/nix-collect-garbage
+bin/nix-copy-closure
+bin/nix-daemon
+bin/nix-env
+bin/nix-hash
+bin/nix-instantiate
+bin/nix-prefetch-url
+bin/nix-shell
+bin/nix-store
+etc/profile.d/nix-daemon.sh
+etc/profile.d/nix.sh
+include/nix/affinity.hh
+include/nix/archive.hh
+include/nix/args.hh
+include/nix/attr-path.hh
+include/nix/attr-set.hh
+include/nix/binary-cache-store.hh
+include/nix/builtins.hh
+include/nix/common-args.hh
+include/nix/common-eval-args.hh
+include/nix/compression.hh
+include/nix/config.h
+include/nix/config.hh
+include/nix/crypto.hh
+include/nix/derivations.hh
+include/nix/download.hh
+include/nix/eval-inline.hh
+include/nix/eval.hh
+include/nix/finally.hh
+include/nix/fs-accessor.hh
+include/nix/function-trace.hh
+include/nix/get-drvs.hh
+include/nix/globals.hh
+include/nix/hash.hh
+include/nix/istringstream_nocopy.hh
+include/nix/json-to-value.hh
+include/nix/json.hh
+include/nix/lazy.hh
+include/nix/lexer-tab.hh
+include/nix/local-store.hh
+include/nix/logging.hh
+include/nix/lru-cache.hh
+include/nix/machines.hh
+include/nix/monitor-fd.hh
+include/nix/names.hh
+include/nix/nar-accessor.hh
+include/nix/nar-info-disk-cache.hh
+include/nix/nar-info.hh
+include/nix/nixexpr.hh
+include/nix/parsed-derivations.hh
+include/nix/parser-tab.hh
+include/nix/pathlocks.hh
+include/nix/pool.hh
+include/nix/primops.hh
+include/nix/profiles.hh
+include/nix/ref.hh
+include/nix/references.hh
+include/nix/remote-fs-accessor.hh
+include/nix/remote-store.hh
+include/nix/s3-binary-cache-store.hh
+include/nix/s3.hh
+include/nix/schema.sql.gen.hh
+include/nix/serialise.hh
+include/nix/serve-protocol.hh
+include/nix/shared.hh
+include/nix/sqlite.hh
+include/nix/ssh.hh
+include/nix/store-api.hh
+include/nix/symbol-table.hh
+include/nix/sync.hh
+include/nix/thread-pool.hh
+include/nix/types.hh
+include/nix/util.hh
+include/nix/value-to-json.hh
+include/nix/value-to-xml.hh
+include/nix/value.hh
+include/nix/worker-protocol.hh
+include/nix/xml-writer.hh
+lib/libnixexpr.so
+lib/libnixmain.so
+lib/libnixstore.so
+lib/libnixutil.so
+lib/pkgconfig/nix-expr.pc
+lib/pkgconfig/nix-main.pc
+lib/pkgconfig/nix-store.pc
+libexec/nix/build-remote
+share/nix/corepkgs/buildenv.nix
+share/nix/corepkgs/config.nix
+share/nix/corepkgs/derivation.nix
+share/nix/corepkgs/fetchurl.nix
+share/nix/corepkgs/imported-drv-to-derivation.nix
+share/nix/corepkgs/unpack-channel.nix
+share/nix/sandbox/sandbox-defaults.sb
+share/nix/sandbox/sandbox-minimal.sb
+share/nix/sandbox/sandbox-network.sb
diff --git a/nix/TODO b/nix/TODO
index 008b6cddff..940881e058 100644
--- a/nix/TODO
+++ b/nix/TODO
@@ -1,32 +1,3 @@
 * port to NetBSD?
   There is a high probability that in addition to packaging, supported platforms
   must be tested and non-supported (like NetBSD host) ported to.
-
-* building TODO:
-c++ -std=c++17 -o src/libexpr/value-to-xml.o -c src/libexpr/value-to-xml.cc -g -Wall -include config.h -fPIC -g -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr -I src/nix  -I/usr/pkg/include -I/usr/pkg/include -I/usr/pkg/include -I/usr/pkg/include -DREADLINE -I/usr/pkg/include -O2 -D_FORTIFY_SOURCE=2 -pthread -I/usr/pkg/include -I/usr/include -I/usr/include/readline -I/usr/pkg/include/sodium -I/usr/include/krb5  -MMD -MF src/libexpr/.value-to-xml.o.dep -MP
-c++ -std=c++17 -o /usr/work/wip/nix/work/nix-2.3.7/src/libutil/libnixutil.so -shared -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib -pthread -Wl,--no-copy-dt-needed-entries src/libutil/affinity.o src/libutil/archive.o src/libutil/args.o src/libutil/compression.o src/libutil/config.o src/libutil/hash.o src/libutil/json.o src/libutil/logging.o src/libutil/serialise.o src/libutil/thread-pool.o src/libutil/util.o src/libutil/xml-writer.o -llzma -L/usr/pkg/lib -lbz2 -pthread -lcrypto -L/usr/pkg/lib -lbrotlienc -lbrotlidec  -lboost_context -Wl,-z,defs -Wl,-soname=libnixutil.so   
-ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::XzDecompressionSink(nix::Sink&)':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:54: undefined reference to `lzma_stream_decoder'
-ld: src/libutil/compression.o: in function `nix::XzCompressionSink::XzCompressionSink(nix::Sink&, bool)':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:258: undefined reference to `lzma_easy_encoder'
-ld: src/libutil/compression.o: in function `nix::XzCompressionSink::~XzCompressionSink()':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:271: undefined reference to `lzma_end'
-ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::~XzDecompressionSink()':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:65: undefined reference to `lzma_end'
-ld: src/libutil/compression.o: in function `nix::XzCompressionSink::~XzCompressionSink()':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:271: undefined reference to `lzma_end'
-ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::~XzDecompressionSink()':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:65: undefined reference to `lzma_end'
-ld: /usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:65: undefined reference to `lzma_end'
-ld: src/libutil/compression.o:/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:271: more undefined references to `lzma_end' follow
-ld: src/libutil/compression.o: in function `nix::XzCompressionSink::write(unsigned char const*, unsigned long)':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:288: undefined reference to `lzma_code'
-ld: /usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:288: undefined reference to `lzma_code'
-ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::write(unsigned char const*, unsigned long)':
-/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:82: undefined reference to `lzma_code'
-ld: /usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:82: undefined reference to `lzma_code'
-gmake: *** [mk/lib.mk:104: src/libutil/libnixutil.so] Error 1
-gmake: *** Waiting for unfinished jobs....
-*** Error code 2
-
-