Merge pull request #23646 from copumpkin/buildbot-cleanup-take-2

buildbot: fix .withPlugins to propagate inputs
NixOS · Mar 8, 2017 · 9dc3c90 · 9dc3c90
2 parents 8dce538 + ca5a1d9
commit 9dc3c90
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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 {