Nix: fix cross-compilation

This commit is contained in:
Mihai Fufezan 2024-07-27 20:21:53 +03:00
parent f95d150937
commit 4918e57979
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
2 changed files with 10 additions and 4 deletions

View file

@ -31,6 +31,12 @@
localSystem.system = system; localSystem.system = system;
overlays = with self.overlays; [aquamarine]; overlays = with self.overlays; [aquamarine];
}); });
pkgsCrossFor = eachSystem (system: crossSystem:
import nixpkgs {
localSystem = system;
crossSystem = crossSystem;
overlays = with self.overlays; [aquamarine];
});
mkDate = longDate: (lib.concatStringsSep "-" [ mkDate = longDate: (lib.concatStringsSep "-" [
(builtins.substring 0 4 longDate) (builtins.substring 0 4 longDate)
(builtins.substring 4 2 longDate) (builtins.substring 4 2 longDate)
@ -72,6 +78,7 @@
packages = eachSystem (system: { packages = eachSystem (system: {
default = self.packages.${system}.aquamarine; default = self.packages.${system}.aquamarine;
inherit (pkgsFor.${system}) aquamarine aquamarine-with-tests; inherit (pkgsFor.${system}) aquamarine aquamarine-with-tests;
aquamarine-cross = (pkgsCrossFor.${system} "aarch64-linux").aquamarine;
}); });
formatter = eachSystem (system: pkgsFor.${system}.alejandra); formatter = eachSystem (system: pkgsFor.${system}.alejandra);

View file

@ -25,6 +25,8 @@ stdenv.mkDerivation {
inherit version doCheck; inherit version doCheck;
src = ../.; src = ../.;
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
hyprwayland-scanner hyprwayland-scanner
@ -32,6 +34,7 @@ stdenv.mkDerivation {
]; ];
buildInputs = [ buildInputs = [
hwdata
hyprutils hyprutils
libdisplay-info libdisplay-info
libdrm libdrm
@ -46,10 +49,6 @@ stdenv.mkDerivation {
wayland-protocols wayland-protocols
]; ];
depsBuildBuild = [
hwdata
];
outputs = ["out" "dev"]; outputs = ["out" "dev"];
cmakeBuildType = "RelWithDebInfo"; cmakeBuildType = "RelWithDebInfo";