diff options
| -rw-r--r-- | Omni/Bild/Builder.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Omni/Bild/Builder.nix b/Omni/Bild/Builder.nix index e1b0122..603cab9 100644 --- a/Omni/Bild/Builder.nix +++ b/Omni/Bild/Builder.nix @@ -193,8 +193,9 @@ with bild; let (let copyDeps = lib.strings.concatMapStringsSep "\n" (d: '' - ${pkgs.coreutils}/bin/cp -rL ${d}/hidir/. . 2>/dev/null || true - ${pkgs.coreutils}/bin/cp -rL ${d}/odir/. . 2>/dev/null || true + ${pkgs.coreutils}/bin/cp -rfL ${d}/hidir/. . 2>/dev/null || true + ${pkgs.coreutils}/bin/cp -rfL ${d}/odir/. . 2>/dev/null || true + ${pkgs.coreutils}/bin/chmod -R +w . 2>/dev/null || true '') depDrvs; in '' @@ -202,7 +203,6 @@ with bild; let ${pkgs.coreutils}/bin/cp -rL $src/. . ${pkgs.coreutils}/bin/chmod -R +w . ${copyDeps} - ${pkgs.coreutils}/bin/chmod -R +w . || true ${ghcPkg}/bin/ghc -c \ -Wall -Werror -haddock -Winvalid-haddock \ -i. \ @@ -215,10 +215,13 @@ with bild; let }; # Recursive attrset of all module derivations + # mapAttrs' creates {sanitized-name = drv}, while nodeImports use original names modules = lib.fix (self: - lib.mapAttrs + lib.mapAttrs' (modName: node: - mkModuleDrv modName node (map (dep: builtins.getAttr dep self) node.nodeImports)) + lib.nameValuePair (sanitize modName) ( + mkModuleDrv modName node (map (dep: builtins.getAttr (sanitize dep) self) node.nodeImports) + )) graph.graphModules); in # Final link derivation |