diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
| commit | ecb3a1afa2395c46c4ba2ec9da550f45414dbe6d (patch) | |
| tree | 6d1038ee909bd1ba69948a0bc326cd5ba6824e01 /src/libstore/builtins | |
| parent | ab88f4bbd4117db458a79f0a02a4de7bf7931f4c (diff) | |
| parent | f800d450b78091835ab7ca67847d76e75d877a24 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libstore/builtins')
| -rw-r--r-- | src/libstore/builtins/buildenv.hh | 2 | ||||
| -rw-r--r-- | src/libstore/builtins/fetchurl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/builtins/buildenv.hh b/src/libstore/builtins/buildenv.hh index 0a37459b0..73c0f5f7f 100644 --- a/src/libstore/builtins/buildenv.hh +++ b/src/libstore/builtins/buildenv.hh @@ -9,7 +9,7 @@ struct Package { Path path; bool active; int priority; - Package(Path path, bool active, int priority) : path{path}, active{active}, priority{priority} {} + Package(const Path & path, bool active, int priority) : path{path}, active{active}, priority{priority} {} }; typedef std::vector<Package> Packages; diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc index b1af3b4fc..f6ae5d2e6 100644 --- a/src/libstore/builtins/fetchurl.cc +++ b/src/libstore/builtins/fetchurl.cc @@ -24,7 +24,7 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData) Path storePath = getAttr("out"); auto mainUrl = getAttr("url"); - bool unpack = get(drv.env, "unpack", "") == "1"; + bool unpack = get(drv.env, "unpack").value_or("") == "1"; /* Note: have to use a fresh downloader here because we're in a forked process. */ |