diff options
Diffstat (limited to 'Omni/Bild/Builder.nix')
| -rw-r--r-- | Omni/Bild/Builder.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Omni/Bild/Builder.nix b/Omni/Bild/Builder.nix index b71a12f..37ff821 100644 --- a/Omni/Bild/Builder.nix +++ b/Omni/Bild/Builder.nix @@ -193,24 +193,23 @@ with bild; let (let copyDeps = lib.strings.concatMapStringsSep "\n" (d: '' - cp -rL ${d}/hidir/. hidir/ 2>/dev/null || true + ${pkgs.coreutils}/bin/cp -rL ${d}/hidir/. . 2>/dev/null || true + ${pkgs.coreutils}/bin/cp -rL ${d}/odir/. . 2>/dev/null || true '') depDrvs; in '' set -eu - tar xzf $src - cd source - mkdir -p hidir odir + ${pkgs.coreutils}/bin/cp -rL $src/. . + ${pkgs.coreutils}/bin/chmod -R +w . ${copyDeps} - chmod -R +w hidir || true + ${pkgs.coreutils}/bin/chmod -R +w . || true ${ghcPkg}/bin/ghc -c \ -Wall -Werror -haddock -Winvalid-haddock \ - -i. -ihidir \ - -odir odir -hidir hidir \ + -i. \ ${node.nodePath} - mkdir -p $out/hidir $out/odir - cp -r hidir/* $out/hidir/ || true - cp -r odir/* $out/odir/ || true + ${pkgs.coreutils}/bin/mkdir -p $out/hidir $out/odir + ${pkgs.findutils}/bin/find . -name '*.hi' -exec ${pkgs.coreutils}/bin/cp --parents {} $out/hidir/ \; + ${pkgs.findutils}/bin/find . -name '*.o' -exec ${pkgs.coreutils}/bin/cp --parents {} $out/odir/ \; '') ]; }; @@ -227,6 +226,7 @@ with bild; let inherit name CODEROOT src; nativeBuildInputs = [makeWrapper]; dontConfigure = true; + dontStrip = true; buildPhase = let pkgFlags = lib.strings.concatMapStringsSep " " (p: "-package ${p}") target.langdeps; copyHiFiles = lib.strings.concatMapStringsSep "\n" (drv: "cp -rL ${drv}/hidir/. . 2>/dev/null || true") (lib.attrsets.attrValues modules); |