lix-project/lix
20
58
Fork 31
Code Issues 356 Code Review (Gerrit) Projects 3 Releases Wiki Activity

flake.nix: Fix cross build

Browse source 
The lix package currently fails unless it's using a clang stdenv.
However, the flake's cross build outputs (e.g. `packages.x86_64-linux.nix-armv7l-linux`)
used the default stdenv, normally gcc.
Replace this with clang to fix package build.

Also take this opportunity to remove the no longer necessary `useLLVM = true`
override on FreeBSD. Since 24.05, nixpkgs always sets `useLLVM = true`
on FreeBSD in `lib.systems.elaborate`.

Change-Id: I939302e4f6385291fa9e582d38d908c42f6db89a
This commit is contained in:
Artemis Tosini 2024-11-02 00:57:09 +00:00
parent 834450e237
commit 9903bed3f4
Signed by: artemist
GPG key ID: EE5227935FE3FF18
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
flake.nix
View file

@ -138,14 +138,7 @@
localSystem = { localSystem = {
inherit system; inherit system;
}; };
crossSystem = crossSystem = if crossSystem == null then null else { system = crossSystem; };
if crossSystem == null then
null
else
{
system = crossSystem;
}
// lib.optionalAttrs (crossSystem == "x86_64-freebsd") { useLLVM = true; };
overlays = [ (overlayFor (p: p.${stdenv})) ]; overlays = [ (overlayFor (p: p.${stdenv})) ];
}; };
stdenvs = forAllStdenvs (make-pkgs null); stdenvs = forAllStdenvs (make-pkgs null);
@ -154,7 +147,7 @@
{ {
inherit stdenvs native; inherit stdenvs native;
static = native.pkgsStatic; static = native.pkgsStatic;
cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv"); cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "clangStdenv");
} }
); );