rarias/nixos-riscv
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove unneeded override of stdenv

Browse Source 
The march and mtune flags are passed by the crossSystem gcc attributes,
which are placed *before* the flags to gcc. This may end up causing some
packages to break, but it is working fine so far.
This commit is contained in:
Rodrigo Arias 2024-01-24 10:00:19 +01:00
parent eff49c6ee3
commit c0ecd32173
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
overlay.nix
View File

@ -31,16 +31,6 @@ final: prev:
filesToInstall = ["u-boot.bin" "u-boot"]; filesToInstall = ["u-boot.bin" "u-boot"];
}; };
# To cross compile for riscv64, we need to populate this env variable, not
# NIX_CFLAGS_COMPILE, otherwise we affect the packages for x86.
stdenv = if prev.stdenv.buildPlatform != prev.stdenv.hostPlatform
then
prev.stdenvAdapters.addAttrsToDerivation {
NIX_CFLAGS_COMPILE_riscv64_unknown_linux_gnu = "-march=rv64g";
} prev.stdenv
else
prev.stdenv;
opensbi-uboot = prev.opensbi.overrideAttrs (old: { opensbi-uboot = prev.opensbi.overrideAttrs (old: {
makeFlags = old.makeFlags ++ [ makeFlags = old.makeFlags ++ [
# Build OpenSBI without compressed instructions # Build OpenSBI without compressed instructions