diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-03-08 12:39:44 -0500 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-03-08 12:39:44 -0500 |
| commit | ca5a1d927f13c4c36e2112c68b3512eda5f76e0c (patch) | |
| tree | 35d227914ee9c312957840bf4145308e2dbd2714 /pkgs/development/tools/build-managers | |
| parent | a53d5cfaba8a65813edd0107a6489eb2c57bc8fd (diff) | |
| download | nixlib-ca5a1d927f13c4c36e2112c68b3512eda5f76e0c.tar nixlib-ca5a1d927f13c4c36e2112c68b3512eda5f76e0c.tar.gz nixlib-ca5a1d927f13c4c36e2112c68b3512eda5f76e0c.tar.bz2 nixlib-ca5a1d927f13c4c36e2112c68b3512eda5f76e0c.tar.lz nixlib-ca5a1d927f13c4c36e2112c68b3512eda5f76e0c.tar.xz nixlib-ca5a1d927f13c4c36e2112c68b3512eda5f76e0c.tar.zst nixlib-ca5a1d927f13c4c36e2112c68b3512eda5f76e0c.zip | |
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.
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/buildbot/default.nix | 5 |
1 files 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 { |