File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change 23
23
stackProj = ( stackProject' projectArgs ) ;
24
24
25
25
exeExt = stdenv . hostPlatform . extensions . executable ;
26
+ crossSuffix = lib . optionalString ( stdenv . hostPlatform != stdenv . buildPlatform ) "-${ stdenv . hostPlatform . config } " ;
26
27
27
28
in recurseIntoAttrs ( {
28
29
# Does not work on ghcjs because it needs zlib.
@@ -89,7 +90,7 @@ in recurseIntoAttrs ({
89
90
dirExists "$pkga_basedir/html/pkga-0.1.0.0"
90
91
91
92
pkgb_basedir="${ project . hsPkgs . pkgb . coverageReport } /share/hpc/vanilla"
92
- testTix="$pkgb_basedir/tix/pkgb-test-tests-0.1.0.0-check/tests${ exeExt } .tix"
93
+ testTix="$pkgb_basedir/tix/pkgb-test-tests${ crossSuffix } -0.1.0.0-check${ crossSuffix } /tests${ exeExt } .tix"
93
94
libTix="$pkgb_basedir/tix/pkgb-0.1.0.0/pkgb-0.1.0.0.tix"
94
95
fileExistsNonEmpty "$testTix"
95
96
fileExistsNonEmpty "$libTix"
@@ -116,8 +117,8 @@ in recurseIntoAttrs ({
116
117
dirExists "$project_basedir/tix/pkga-0.1.0.0"
117
118
dirExists "$project_basedir/tix/pkgb-0.1.0.0"
118
119
fileExistsNonEmpty "$project_basedir/tix/pkgb-0.1.0.0/pkgb-0.1.0.0.tix"
119
- dirExists "$project_basedir/tix/pkgb-test-tests-0.1.0.0-check"
120
- fileExistsNonEmpty "$project_basedir/tix/pkgb-test-tests-0.1.0.0-check/tests${ exeExt } .tix"
120
+ dirExists "$project_basedir/tix/pkgb-test-tests${ crossSuffix } -0.1.0.0-check${ crossSuffix } "
121
+ fileExistsNonEmpty "$project_basedir/tix/pkgb-test-tests${ crossSuffix } -0.1.0.0-check${ crossSuffix } /tests${ exeExt } .tix"
121
122
'' ) ( [ cabalProj ] ++ optional ( compiler-nix-name == "ghc865" ) stackProj ) ) }
122
123
123
124
touch $out
You can’t perform that action at this time.
0 commit comments