Nix: using lib.getDev instead of makeSearchPathOutput

YPares · YPares · commit da1102b49463 · 2016-09-26T18:40:15.000+02:00
diff --git a/src/Stack/Nix.hs b/src/Stack/Nix.hs
@@ -98,12 +98,10 @@ runShellAndExit mprojectRoot getCompilerVersion getCmdArgs = do
                               ["with (import <nixpkgs> {}); "
                               ,"let inputs = ",pkgsStr,"; "
                               ,    "libPath = lib.makeLibraryPath inputs; "
-                              ,    "stackExtraArgs = lib.concatStrings ("
-                              ,      "lib.foldl' (acc: p: acc ++ [\" --extra-lib-dirs \" p]) [] "
-                              ,        "(lib.splitString '':'' libPath) ++ "
-                              ,      "lib.foldl' (acc: p: acc ++ [\" --extra-include-dirs \" p]) [] "
-                              ,        "(lib.splitString '':'' (lib.makeSearchPathOutput ''dev'' ''include'' inputs))"
-                              ,    "); in "
+                              ,    "stackExtraArgs = lib.concatMap (pkg: "
+                              ,    "[ ''--extra-lib-dirs=${lib.getLib pkg}/lib'' "
+                              ,    "  ''--extra-include-dirs=${lib.getDev pkg}/include'' ]"
+                              ,    ") inputs; in "
                               ,"runCommand ''myEnv'' { "
                               ,"buildInputs = lib.optional stdenv.isLinux glibcLocales ++ inputs; "
                               ,T.pack platformVariantEnvVar <> "=''nix''; "
