replace makeSearchPath tree-wise to take care of possible multiple outputs

2016-04-13 22:09:41 +03:00
parent e26119619f
commit 8b7ebaffeb
56 changed files with 71 additions and 72 deletions
@@ -46,12 +46,12 @@ mkDerivation rec {

  postInstall =
    let
-      binpath = makeSearchPath "bin" (
+      binpath = makeBinPath (
        filter (x: x != null)
        [ out git bazaar cvs darcs fossil mercurial
          monotone rcs src subversion cvs_fast_export ]
      );
-      pythonpath = makeSearchPath (python27.sitePackages) (
+      pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] (
        filter (x: x != null)
        [ python27Packages.readline or null python27Packages.hglib or null ]
      );