aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-04-16 14:10:05 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-04-16 14:10:05 +0200
commitba66455636f40264d44c7e1fb87e13653b22042a (patch)
tree3dcd0ac208ff767715ba21d889642c670165a91f /src/nix
parentaecf07b1d6c21b8f402545912ae6c053d0f12a11 (diff)
Improve incremental build
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/build.cc1
-rw-r--r--src/nix/command.hh3
-rw-r--r--src/nix/flake.cc2
-rw-r--r--src/nix/installables.cc1
4 files changed, 5 insertions, 2 deletions
diff --git a/src/nix/build.cc b/src/nix/build.cc
index ef6b48969..9ef07dcdb 100644
--- a/src/nix/build.cc
+++ b/src/nix/build.cc
@@ -3,6 +3,7 @@
#include "common-args.hh"
#include "shared.hh"
#include "store-api.hh"
+#include "primops/flake.hh"
using namespace nix;
diff --git a/src/nix/command.hh b/src/nix/command.hh
index a5ae56fb9..5d0c0c82c 100644
--- a/src/nix/command.hh
+++ b/src/nix/command.hh
@@ -1,7 +1,6 @@
#pragma once
#include "args.hh"
-#include "primops/flake.hh"
#include "common-eval-args.hh"
#include <optional>
@@ -48,7 +47,7 @@ struct GitRepoCommand : virtual Args
struct FlakeCommand : virtual Args
{
- FlakeUri flakeUri;
+ std::string flakeUri;
FlakeCommand()
{
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 3b37ad7a0..2079b1c27 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -3,6 +3,8 @@
#include "shared.hh"
#include "progress-bar.hh"
#include "eval.hh"
+#include "primops/flake.hh"
+
#include <nlohmann/json.hpp>
#include <queue>
diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index 37217397a..963321336 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -7,6 +7,7 @@
#include "get-drvs.hh"
#include "store-api.hh"
#include "shared.hh"
+#include "primops/flake.hh"
#include <regex>