diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-07T19·47+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-07T19·47+0100 |
| commit | 6f4682ad36c97355fbb7ba86a9ce265c22102055 (patch) | |
| tree | 99b5fcd1f04f3ab95852e7ffea379b9bfbceeae8 /src/build-remote | |
| parent | caa5793b4a74049ee37dd88eb1c5b785456ce40d (diff) | |
| parent | bfa41eb6714a7e7c3956389ee063e898bd1f37ff (diff) | |
Merge branch 'nix-copy-closure-c++' of https://github.com/shlevy/nix
Diffstat (limited to 'src/build-remote')
| -rw-r--r-- | src/build-remote/build-remote.cc | 1 | ||||
| -rw-r--r-- | src/build-remote/local.mk | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index acbd308f84e1..2ce20882da17 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -12,7 +12,6 @@ #include "shared.hh" #include "pathlocks.hh" #include "globals.hh" -#include "serve-protocol.hh" #include "serialise.hh" #include "store-api.hh" #include "derivations.hh" diff --git a/src/build-remote/local.mk b/src/build-remote/local.mk index 05b8cb451435..62d5a010c247 100644 --- a/src/build-remote/local.mk +++ b/src/build-remote/local.mk @@ -8,4 +8,4 @@ build-remote_LIBS = libmain libutil libformat libstore build-remote_SOURCES := $(d)/build-remote.cc -build-remote_CXXFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" -Isrc/nix-store +build-remote_CXXFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" |