nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-21 01:39:36 +01:00
Code Activity

Move code around

Browse source
This commit is contained in:
Eelco Dolstra 2019-09-11 13:10:46 +02:00
parent d14b1c261c
commit d33dd6e6c0
7 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/builtins/unpack-channel.cc
View file

@ -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)

2
src/libstore/local.mk
View file

@ -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)

6
src/libstore/rust.hh
View file

@ -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);
}