Skip to content

Commit d08f9d2

Browse files
authored
Remove extra-test-libs for windows (input-output-hk#2097)
extra-test-libs is not used any more for windows
1 parent 0e42ffc commit d08f9d2

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

overlays/mingw_w64.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
, iserv-proxy
88
, iserv-proxy-interpreter
99
, gmp
10-
# extra libraries. Their dlls are copied
11-
# when tests are run.
12-
, extra-test-libs ? []
1310
, hostPlatform
1411
, symlinkJoin
1512
}:
@@ -105,10 +102,6 @@ let
105102
echo "================================================================================"
106103
echo "RUNNING TESTS for $name via wine64"
107104
echo "================================================================================"
108-
echo "Copying extra test libraries ..."
109-
for p in ${lib.concatStringsSep " "extra-test-libs}; do
110-
find "$p" -iname '*.dll' -exec cp {} . \;
111-
done
112105
# copy all .dlls into the local directory.
113106
# we ask ghc-pkg for *all* dynamic-library-dirs and then iterate over the unique set
114107
# to copy over dlls as needed.

overlays/windows.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ final: prev:
4949
# iserv-proxy needs to come from the buildPackages, as it needs to run on the
5050
# build host.
5151
inherit (final.haskell-nix.iserv-proxy-exes.${config.compiler.nix-name}) iserv-proxy iserv-proxy-interpreter;
52-
# we need to use openssl.bin here, because the .dll's are in the .bin expression.
53-
# extra-test-libs = [ pkgs.rocksdb pkgs.openssl.bin pkgs.libffi pkgs.gmp ];
5452
} // {
5553
# we can perform testing of cross compiled test-suites by using wine.
5654
# Therefore let's enable doCrossCheck here!

0 commit comments

Comments
 (0)