diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index f7c4e6d5bbd..8d4d9abcc66 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -9,7 +9,6 @@ #include "pathlocks.hh" #include "processes.hh" #include "git.hh" -#include "mounted-source-accessor.hh" #include "git-utils.hh" #include "logging.hh" #include "finally.hh" diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build index fa5286ce981..725254b56ce 100644 --- a/src/libfetchers/meson.build +++ b/src/libfetchers/meson.build @@ -54,7 +54,6 @@ sources = files( 'github.cc', 'indirect.cc', 'mercurial.cc', - 'mounted-source-accessor.cc', 'path.cc', 'registry.cc', 'store-path-accessor.cc', @@ -72,7 +71,6 @@ headers = files( 'filtering-source-accessor.hh', 'git-lfs-fetch.hh', 'git-utils.hh', - 'mounted-source-accessor.hh', 'registry.hh', 'store-path-accessor.hh', 'tarball.hh', diff --git a/src/libfetchers/mounted-source-accessor.hh b/src/libfetchers/mounted-source-accessor.hh deleted file mode 100644 index 45cbcb09a24..00000000000 --- a/src/libfetchers/mounted-source-accessor.hh +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "source-accessor.hh" - -namespace nix { - -ref makeMountedSourceAccessor(std::map> mounts); - -} diff --git a/src/libutil/meson.build b/src/libutil/meson.build index 9ee3770de2c..b6a33135a9b 100644 --- a/src/libutil/meson.build +++ b/src/libutil/meson.build @@ -153,6 +153,7 @@ sources = files( 'json-utils.cc', 'logging.cc', 'memory-source-accessor.cc', + 'mounted-source-accessor.cc', 'position.cc', 'posix-source-accessor.cc', 'references.cc', diff --git a/src/libfetchers/mounted-source-accessor.cc b/src/libutil/mounted-source-accessor.cc similarity index 98% rename from src/libfetchers/mounted-source-accessor.cc rename to src/libutil/mounted-source-accessor.cc index 68f3a546b57..45c8adbd8b5 100644 --- a/src/libfetchers/mounted-source-accessor.cc +++ b/src/libutil/mounted-source-accessor.cc @@ -1,4 +1,4 @@ -#include "mounted-source-accessor.hh" +#include "source-accessor.hh" namespace nix { diff --git a/src/libutil/source-accessor.hh b/src/libutil/source-accessor.hh index 42af8256a8f..b79f8af92cf 100644 --- a/src/libutil/source-accessor.hh +++ b/src/libutil/source-accessor.hh @@ -214,4 +214,6 @@ ref getFSSourceAccessor(); */ ref makeFSSourceAccessor(std::filesystem::path root); +ref makeMountedSourceAccessor(std::map> mounts); + }