Build against nix-master

(cherry picked from commit e7f2139e25)
2019-12-30 22:49:26 +01:00
parent b790a00729
commit e4f5156c41
13 changed files with 166 additions and 139 deletions
--- a/src/libhydra/db.hh
+++ b/src/libhydra/db.hh
@ -12,7 +12,7 @@ struct Connection : pqxx::connection
    std::string getFlags()
    {
        using namespace nix;
-        auto s = getEnv("HYDRA_DBI", "dbi:Pg:dbname=hydra;");
+        auto s = getEnv("HYDRA_DBI").value_or("dbi:Pg:dbname=hydra;");
        std::string prefix = "dbi:Pg:";
        if (std::string(s, 0, prefix.size()) != prefix)
            throw Error("$HYDRA_DBI does not denote a PostgreSQL database");