Fix build

https://hydra.nixos.org/build/63172338
NixOS · Nov 1, 2017 · 212e72c · 212e72c
1 parent e026bc3
commit 212e72c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libexpr/common-eval-args.hh b/src/libexpr/common-eval-args.hh
@@ -6,7 +6,7 @@ namespace nix {
 
 class Store;
 class EvalState;
-struct Bindings;
+class Bindings;
 
 struct MixEvalArgs : virtual Args
 {

diff --git a/src/libexpr/primops/fetchgit.cc b/src/libexpr/primops/fetchgit.cc
@@ -56,7 +56,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
         }
     }
 
-    if (!ref) ref = "master";
+    if (!ref) ref = "master"s;
 
     if (rev != "") {
         std::regex revRegex("^[0-9a-fA-F]{40}$");