aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2023-03-10 09:32:06 +0100
committerKarel Kočí <cynerd@email.cz>2023-03-10 09:32:41 +0100
commit42d69ea28a5127941ebf0eaa19e5d33ce3cdd457 (patch)
tree0ea3c47aa7719b970ba860e9ea3022a4501bbe42
parentd0c21ad4a6915ee3cde11b1979cfe9b3c1cfcf56 (diff)
downloadnixos-personal-42d69ea28a5127941ebf0eaa19e5d33ce3cdd457.tar.gz
nixos-personal-42d69ea28a5127941ebf0eaa19e5d33ce3cdd457.tar.bz2
nixos-personal-42d69ea28a5127941ebf0eaa19e5d33ce3cdd457.zip
devShells/apo: add glibc static
-rw-r--r--devShells/apo.nix9
-rw-r--r--nixos/modules/compile.nix2
2 files changed, 2 insertions, 9 deletions
diff --git a/devShells/apo.nix b/devShells/apo.nix
index b036c9b..c1049a8 100644
--- a/devShells/apo.nix
+++ b/devShells/apo.nix
@@ -15,19 +15,12 @@
};
};
};
- #mipsPkgs = import nixpkgs.outPath {
- # localSystem = system;
- # crossSystem = {
- # config = "mips-none-elf";
- # libc = "newlib-nano";
- # };
- #};
in
pkgs.buildPackages.mkShell {
packages = with pkgs; [
qtrvsim
+ glibc.static
riscvPkgs.buildPackages.gcc
- #mipsPkgs.buildPackages.gcc
];
inputsFrom = [default c];
meta.platforms = nixpkgs.lib.platforms.linux;
diff --git a/nixos/modules/compile.nix b/nixos/modules/compile.nix
index 45cc9e6..18ff6f5 100644
--- a/nixos/modules/compile.nix
+++ b/nixos/modules/compile.nix
@@ -19,7 +19,7 @@ with lib; {
cores = 0;
};
- boot.binfmt.emulatedSystems = ["armv7l-linux" "aarch64-linux"];
+ boot.binfmt.emulatedSystems = ["armv7l-linux" "aarch64-linux" "riscv32-linux"];
environment.systemPackages = with pkgs; [
# Tools