summaryrefslogtreecommitdiff
path: root/src/rebar_prv_install_deps.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/rebar_prv_install_deps.erl')
-rw-r--r--src/rebar_prv_install_deps.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 2498215..de4be27 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -74,7 +74,7 @@ do(State) ->
handle_deps(State, Locks)
end,
- Source = ProjectApps ++ rebar_state:src_deps(State1),
+ Source = ProjectApps ++ rebar_state:get(State1, all_deps),
{ok, Sort} = rebar_topo:sort_apps(Source),
{ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
@@ -123,15 +123,14 @@ handle_deps(State, Deps, Update) ->
end, S)
end,
- AllDeps = lists:keymerge(2
- ,rebar_state:src_apps(State2)
- ,Solved),
+ AllDeps = lists:keymerge(2, lists:keymerge(2
+ ,rebar_state:src_apps(State2)
+ ,Solved), SrcDeps),
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
{ok, State3}.
-
%% ===================================================================
%% Internal functions
%% ===================================================================