diff options
author | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-02-07T16·53+0100 |
---|---|---|
committer | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-02-07T16·53+0100 |
commit | 163e39547ae6f69586e23b85e462bfc5a2131a17 (patch) | |
tree | ebad1d32bfe5938e0393627d7430b5d145ab5657 /src/libstore/store-api.hh | |
parent | 9d1e22f743ea9ca232d39d498b675d7e5ac1ca87 (diff) | |
parent | 48c192ca2d5bc65b69d2336c8577258f8eb80cf8 (diff) |
Merge branch 'master' of https://github.com/NixOS/nix into parallel-xz
Diffstat (limited to 'src/libstore/store-api.hh')
-rw-r--r-- | src/libstore/store-api.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index aa83c2ded8c8..563aa566bd37 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -307,9 +307,9 @@ public: /* This is the preparatory part of addToStore(); it computes the store path to which srcPath is to be copied. Returns the store path and the cryptographic hash of the contents of srcPath. */ - std::pair<Path, Hash> computeStorePathForPath(const Path & srcPath, - bool recursive = true, HashType hashAlgo = htSHA256, - PathFilter & filter = defaultPathFilter) const; + std::pair<Path, Hash> computeStorePathForPath(const string & name, + const Path & srcPath, bool recursive = true, + HashType hashAlgo = htSHA256, PathFilter & filter = defaultPathFilter) const; /* Preparatory part of addTextToStore(). |