From ca5a1d927f13c4c36e2112c68b3512eda5f76e0c Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 8 Mar 2017 12:39:44 -0500 Subject: [PATCH] buildbot: fix .withPlugins to propagate inputs Before I was just grabbing the immediate dependencies. I _think_ this will do the right thing by using the pre-existing setup hook to avoid having to compute the transitive closure myself. --- pkgs/development/tools/build-managers/buildbot/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ad37aee5bb98..ed24e917a1cb 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -2,11 +2,10 @@ let withPlugins = plugins: runCommand "wrapped-${package.name}" { - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] ++ plugins; passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); } '' - makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" pythonPackages.python.sitePackages plugins} + makeWrapper ${package}/bin/buildbot $out/bin/buildbot --prefix PYTHONPATH : $PYTHONPATH ''; package = pythonPackages.buildPythonApplication (rec {