Fix the CI run

tweag · Sep 19, 2018 · 1cb0143 · 1cb0143
1 parent 70211a3
commit 1cb0143
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,7 +18,8 @@ jobs:
           name: Build
           command: |
             # XXX Workaround https://github.com/NixOS/nix/issues/1969.
-            nix-build nixpkgs.nix -A haskell.compiler.ghc822
+            echo "y: x: x" > dummy_wrapper.nix
+            NIX_PATH=$NIX_PATH:bazel_haskell_wrapper=./dummy_wrapper.nix nix-build tests/ghc.nix
             nix-shell --pure --run "bazel build --jobs=2 //... @haskell_zlib//... --config=ci"
             nix-shell --pure --run "bazel build -c dbg --jobs=2 //... --config=ci"
       - run:
@@ -45,7 +46,8 @@ jobs:
           shell: /bin/bash -eilo pipefail
           command: |
             # XXX Workaround https://github.com/NixOS/nix/issues/1969.
-            nix-build tests/ghc.nix
+            echo "y: x: x" > dummy_wrapper.nix
+            NIX_PATH=$NIX_PATH:bazel_haskell_wrapper=./dummy_wrapper.nix nix-build tests/ghc.nix
             nix-shell --run 'CC=$(which clang) bazel build --jobs=2 //...'
       - run:
           name: Run tests

diff --git a/haskell/import.bzl b/haskell/import.bzl
@@ -39,7 +39,7 @@ def copy_all(ctx, srcs, dest):
             inputs = depset(srcs),
             outputs = [dest],
             mnemonic = "Copy",
-            command = "mkdir -p {dest} && cp -L -T -r \"$@\" {dest}".format(dest = dest.path),
+            command = "mkdir -p {dest} && cp -L -r \"$@\" {dest}".format(dest = dest.path),
             arguments = [args],
         )