git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Use combinePath instead of + for data files. (#1007)
e6ba58fHamish Mackenzie
lib/clean-cabal-component.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -64,7 +64,7 @@ in
64 [dataDir]
64 [dataDir]
65 ++ hsSourceDirs
65 ++ hsSourceDirs
66 ++ includeDirs
66 ++ includeDirs
67− ++ builtins.map (f: dataDir + f) package.dataFiles
67+ ++ builtins.map (f: combinePaths dataDir f) package.dataFiles
68 ++ otherSourceFiles
68 ++ otherSourceFiles
69 ++ builtins.map (d: combinePaths subDir d) (
69 ++ builtins.map (d: combinePaths subDir d) (
70 # These need the subDir added
70 # These need the subDir added