Skip to content

Commit 3799b9e

Browse files
committed
haskellPackages: fix aarch64-android-prebuilt release-haskell jobset
1 parent a7beb46 commit 3799b9e

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

pkgs/top-level/release-haskell.nix

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,26 @@ let
482482
};
483483

484484
pkgsCross = {
485+
aarch64-android-prebuilt.pkgsStatic =
486+
removePlatforms
487+
[
488+
# Android NDK package doesn't support building on
489+
"aarch64-darwin"
490+
"aarch64-linux"
491+
492+
"x86_64-darwin"
493+
]
494+
{
495+
haskell.packages.ghc912 = {
496+
inherit
497+
(packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.pkgsStatic.haskell.packages.ghc912)
498+
ghc
499+
hello
500+
microlens
501+
;
502+
};
503+
};
504+
485505
ghcjs =
486506
removePlatforms
487507
[
@@ -515,14 +535,6 @@ let
515535
;
516536
};
517537

518-
haskell.packages.ghc912 = {
519-
inherit (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.haskell.packages.ghc912)
520-
ghc
521-
hello
522-
microlens
523-
;
524-
};
525-
526538
haskell.packages.ghcHEAD = {
527539
inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD)
528540
ghc

0 commit comments

Comments
 (0)