diff options
| -rw-r--r-- | release.nix | 2 | ||||
| -rw-r--r-- | src/libstore/nar-info.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/release.nix b/release.nix index 4803788fe009..b5e5e945e76c 100644 --- a/release.nix +++ b/release.nix @@ -99,6 +99,8 @@ let doInstallCheck = true; installCheckFlags = "sysconfdir=$(out)/etc"; + + stdenv = clangStdenv; }); diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc index c0c5cecd1730..4ff4c996dabd 100644 --- a/src/libstore/nar-info.cc +++ b/src/libstore/nar-info.cc @@ -5,7 +5,7 @@ namespace nix { NarInfo::NarInfo(const std::string & s, const std::string & whence) { - auto corrupt = [&]() [[noreturn]] { + auto corrupt = [&]() { throw Error("NAR info file ‘%1%’ is corrupt"); }; @@ -14,6 +14,7 @@ NarInfo::NarInfo(const std::string & s, const std::string & whence) return parseHash(s); } catch (BadHash &) { corrupt(); + return Hash(); // never reached } }; |