diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-03-30 14:29:29 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-03-30 14:39:33 +0200 |
| commit | 2c692a3b144523bca68dd6de618124ba6c9bb332 (patch) | |
| tree | 2aa945ccc2a0b0ba6aa7413ca3874c53feb6094f /src/nix | |
| parent | e0a0ae0467fa8cdcc542f593b9d94283f04508ff (diff) | |
Remove global -I flags
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/local.mk | 2 | ||||
| -rw-r--r-- | src/nix/profile.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nix/local.mk b/src/nix/local.mk index 622f49019..3fcd15dc6 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -15,6 +15,8 @@ nix_SOURCES := \ $(wildcard src/nix-prefetch-url/*.cc) \ $(wildcard src/nix-store/*.cc) \ +nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain + nix_LIBS = libexpr libmain libfetchers libstore libutil libnixrust nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system diff --git a/src/nix/profile.cc b/src/nix/profile.cc index 1759b83a3..c6a4ddd34 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -6,7 +6,7 @@ #include "archive.hh" #include "builtins/buildenv.hh" #include "flake/flakeref.hh" -#include "nix-env/user-env.hh" +#include "../nix-env/user-env.hh" #include <nlohmann/json.hpp> #include <regex> |