From 42d69ea28a5127941ebf0eaa19e5d33ce3cdd457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Fri, 10 Mar 2023 09:32:06 +0100 Subject: devShells/apo: add glibc static --- devShells/apo.nix | 9 +-------- nixos/modules/compile.nix | 2 +- 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 -- cgit v1.2.3