diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-18 21:38:15 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-18 21:38:15 +0000 |
| commit | 40526fbea56a8006eb7f1758d461a5acbe9a1694 (patch) | |
| tree | 5d74492a86f28fb7183897dc2a6d7baf2d24f7f1 /src/nix/local.mk | |
| parent | 6dd471ebf6b9a4996405398093ccb371b8abdf2f (diff) | |
| parent | 6c000eed80565d83d596da800ca0db92e248342e (diff) | |
Merge remote-tracking branch 'upstream/master' into enum-class
Diffstat (limited to 'src/nix/local.mk')
| -rw-r--r-- | src/nix/local.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/local.mk b/src/nix/local.mk index 8c0eed19e..b057b7cc6 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -17,7 +17,7 @@ nix_SOURCES := \ 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_LIBS = libexpr libmain libfetchers libstore libutil nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system @@ -28,4 +28,4 @@ $(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote)) src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh -src/nix/dev-shell.cc: src/nix/get-env.sh.gen.hh +src/nix/develop.cc: src/nix/get-env.sh.gen.hh |