suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request #12444 from erlang-nix/propagate-build-plugins

Browse Source 
Erlang: Pass buildPlugins to rebar3-nix-bootstrap from buildRebar3
This commit is contained in:
Peter Simons 2016-01-17 22:36:11 +01:00
commit 1ab1c7166b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/erlang-modules/build-rebar3.nix
View File

@ -4,7 +4,7 @@
{ name, version { name, version
, src , src
, setupHook ? null , setupHook ? null
, buildInputs ? [], erlangDeps ? [], pluginDeps ? [] , buildInputs ? [], erlangDeps ? [], buildPlugins ? []
, postPatch ? "" , postPatch ? ""
, compilePorts ? false , compilePorts ? false
, installPhase ? null , installPhase ? null
@ -14,8 +14,7 @@
with stdenv.lib; with stdenv.lib;
let let
plugins = pluginDeps ++ (if compilePorts then [pc] else []); ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []);
shell = drv: stdenv.mkDerivation { shell = drv: stdenv.mkDerivation {
name = "interactive-shell-${drv.name}"; name = "interactive-shell-${drv.name}";
@ -28,7 +27,11 @@ let
inherit version; inherit version;
buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
propagatedBuildInputs = erlangDeps ++ plugins; propagatedBuildInputs = unique (erlangDeps ++ ownPlugins);
# The following are used by rebar3-nix-bootstrap
inherit compilePorts;
buildPlugins = ownPlugins;
inherit src; inherit src;

3
pkgs/development/tools/build-managers/rebar3/default.nix
View File

@ -81,8 +81,7 @@ stdenv.mkDerivation {
patches = [ ./hermetic-bootstrap.patch ]; patches = [ ./hermetic-bootstrap.patch ];
buildInputs = [ erlang tree ]; buildInputs = [ erlang tree ];
propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ]; propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ];
postPatch = '' postPatch = ''
echo postPatch echo postPatch