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,7 +46,7 @@ stdenv.mkDerivation rec {

  libPath = stdenv.lib.makeLibraryPath buildInputs
    + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-      (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
+      (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

  preFixup =
    ''