diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-09-11 13:10:46 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-11-26 22:07:28 +0100 |
| commit | d33dd6e6c09d87a59989057ad622a6265ddec2e0 (patch) | |
| tree | a05bc9fef86c320e0b72225e5dba6c8b61044f19 /src/libstore | |
| parent | d14b1c261cd3dfb4be2da943d901a394c3f23205 (diff) | |
Move code around
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/builtins/unpack-channel.cc | 4 | ||||
| -rw-r--r-- | src/libstore/local.mk | 2 | ||||
| -rw-r--r-- | src/libstore/rust.hh | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/libstore/builtins/unpack-channel.cc b/src/libstore/builtins/unpack-channel.cc index 2da26d98e..5fc68cd66 100644 --- a/src/libstore/builtins/unpack-channel.cc +++ b/src/libstore/builtins/unpack-channel.cc @@ -1,6 +1,6 @@ -#include "rust.hh" #include "builtins.hh" #include "compression.hh" +#include "tarfile.hh" namespace nix { @@ -27,7 +27,7 @@ void builtinUnpackChannel(const BasicDerivation & drv) decompressor->finish(); }); - unpack_tarfile(*source, out).use()->unwrap(); + unpackTarfile(*source, out); auto entries = readDirectory(out); if (entries.size() != 1) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index d3254554d..d690fea28 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -6,7 +6,7 @@ libstore_DIR := $(d) libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc) -libstore_LIBS = libutil libnixrust +libstore_LIBS = libutil libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread ifneq ($(OS), FreeBSD) diff --git a/src/libstore/rust.hh b/src/libstore/rust.hh deleted file mode 100644 index dccc98b4b..000000000 --- a/src/libstore/rust.hh +++ /dev/null @@ -1,6 +0,0 @@ -#include "serialise.hh" -#include "rust-ffi.hh" - -extern "C" { - rust::CBox2<rust::Result<std::tuple<>>> unpack_tarfile(rust::Source source, rust::StringSlice dest_dir); -} |