aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJude Taylor <me@jude.bio>2016-08-13 15:27:49 -0700
committerJude Taylor <me@jude.bio>2016-08-13 15:27:49 -0700
commit596e4a5693fc710ee47126d19910951b22d91018 (patch)
treed129a0cf4178d2566af663fca9ffd26ead891010 /src
parent2df9a972fc1f361020ece1a21721379d090dd0ae (diff)
remove old traces of resolve-system-dependencies
Diffstat (limited to 'src')
-rw-r--r--src/libstore/globals.cc2
-rw-r--r--src/resolve-system-dependencies/local.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 7bf48be37..ecf81e8eb 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -76,7 +76,7 @@ void Settings::processEnvironment()
// should be set with the other config options, but depends on nixLibexecDir
#ifdef __APPLE__
- preBuildHook = nixLibexecDir + "/nix/resolve-system-dependencies.pl";
+ preBuildHook = nixLibexecDir + "/nix/resolve-system-dependencies";
#endif
}
diff --git a/src/resolve-system-dependencies/local.mk b/src/resolve-system-dependencies/local.mk
index 4e1379ae8..abf4edaff 100644
--- a/src/resolve-system-dependencies/local.mk
+++ b/src/resolve-system-dependencies/local.mk
@@ -2,6 +2,8 @@ programs += resolve-system-dependencies
resolve-system-dependencies_DIR := $(d)
+resolve-system-dependencies_INSTALL_DIR := $(libexecdir)/nix
+
resolve-system-dependencies_LIBS := libstore libmain libutil libformat
resolve-system-dependencies_SOURCES := $(d)/resolve-system-dependencies.cc