Merge pull request #24 from anmonteiro/anmonteiro/fix-arm64-musl

x-compilation: update setup
mseri · Aug 30, 2023 · 57a56ff · 57a56ff
2 parents bef441b + 6b8f57e
commit 57a56ff
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 19 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,12 +12,14 @@
         pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
           ocamlPackages = super.ocaml-ng.ocamlPackages_4_14;
         });
+        native = pkgs.callPackage ./nix {
+          nix-filter = nix-filter.lib;
+        };
+
       in
       {
         packages = {
-          native = pkgs.callPackage ./nix {
-            nix-filter = nix-filter.lib;
-          };
+          inherit native;
           musl =
             let
               pkgs' = pkgs.pkgsCross.musl64;
@@ -30,12 +32,13 @@
             let
               pkgs' = pkgs.pkgsCross.aarch64-multiplatform-musl;
             in
-            pkgs'.lib.callPackageWith pkgs' ./nix {
+            (pkgs'.lib.callPackageWith pkgs' ./nix {
               static = true;
               nix-filter = nix-filter.lib;
               crossName = "aarch64";
-            };
-
+            }).overrideAttrs (o: {
+              OCAMLFIND_CONF = pkgs'.ocamlPackages.findlib.makeFindlibConf native o;
+            });
         };
       });
 }