File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change 22
22
linux = "x86_64-linux" ;
23
23
darwin = "x86_64-darwin" ;
24
24
} ;
25
- crossSystems = nixpkgsName : nixpkgs : system :
25
+ crossSystems = nixpkgsName : nixpkgs : compilerNixName : system :
26
26
# We need to use the actual nixpkgs version we're working with here, since the values
27
27
# of 'lib.systems.examples' are not understood between all versions
28
28
let lib = nixpkgs . lib ;
29
- in lib . optionalAttrs ( system == "x86_64-linux" ) {
29
+ in lib . optionalAttrs ( system == "x86_64-linux" && compilerNixName != "ghc8101" ) {
30
30
# Windows cross compilation is currently broken on macOS
31
31
inherit ( lib . systems . examples ) mingwW64 ;
32
32
} // lib . optionalAttrs ( system == "x86_64-linux" ) {
@@ -57,7 +57,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: nixpkgs-pin:
57
57
} ) ;
58
58
}
59
59
//
60
- dimension "Cross system" ( crossSystems nixpkgsName genericPkgs system ) ( crossSystemName : crossSystem :
60
+ dimension "Cross system" ( crossSystems nixpkgsName genericPkgs compilerNixName system ) ( crossSystemName : crossSystem :
61
61
# Cross builds
62
62
let pkgs = import pinnedNixpkgsSrc ( nixpkgsArgs // { inherit system crossSystem ; } ) ;
63
63
build = import ./build.nix { inherit pkgs ifdLevel ; } ;
You can’t perform that action at this time.
0 commit comments