Nix: fix cross-compilation

hyprwm · Jul 27, 2024 · 864f527 · 864f527
1 parent f95d150
commit 864f527
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/flake.nix b/flake.nix
@@ -31,6 +31,12 @@
         localSystem.system = system;
         overlays = with self.overlays; [aquamarine];
       });
+    pkgsCrossFor = eachSystem (system: crossSystem:
+      import nixpkgs {
+        localSystem = system;
+        crossSystem = crossSystem;
+        overlays = with self.overlays; [aquamarine];
+      });
     mkDate = longDate: (lib.concatStringsSep "-" [
       (builtins.substring 0 4 longDate)
       (builtins.substring 4 2 longDate)
@@ -72,6 +78,7 @@
     packages = eachSystem (system: {
       default = self.packages.${system}.aquamarine;
       inherit (pkgsFor.${system}) aquamarine aquamarine-with-tests;
+      aquamarine-cross = (pkgsCrossFor.${system} "aarch64-linux").aquamarine;
     });
 
     formatter = eachSystem (system: pkgsFor.${system}.alejandra);

diff --git a/nix/default.nix b/nix/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
+    hwdata
     hyprutils
     libdisplay-info
     libdrm
@@ -46,10 +47,6 @@ stdenv.mkDerivation {
     wayland-protocols
   ];
 
-  depsBuildBuild = [
-    hwdata
-  ];
-
   outputs = ["out" "dev"];
 
   cmakeBuildType = "RelWithDebInfo";