From e3bfa3243adb781ca6bbfa7ae848a5d3305df951 Mon Sep 17 00:00:00 2001
From: Alex Jones <alex.jones@lowrisc.org>
Date: Thu, 17 Oct 2024 12:11:05 +0100
Subject: [PATCH] Replace Nix `env-with-everything` with
 `build-legacy-software`

Removes the `env-with-everything` environment, as there isn't much
practical reason to have an environment where you build the simulator
and also have the legacy toolchain, exclusive to Linux.

Instead, it makes more sense to retain the existing simulator
environment, and add a separate environment `build-legacy-software` that
can be used to get the legacy toolchain on Linux systems. This means
that entering this environment for building legacy software is much
quicker, and the same functionality can be retained by overlaying the
two environments (entering the sim environment, then the legacy one).
---
 flake.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 036d939..9fc57cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -190,9 +190,9 @@
           packages = [sonataSystemPkgs.sonata-simulator] ++ default.nativeBuildInputs;
           SONATA_SIM_BOOT_STUB = "${sonataSystemPkgs.sonata-sim-boot-stub.out}/share/sim_boot_stub";
         };
-        env-with-everything = pkgs.mkShell {
-          name = "sonata-sw-with-everything";
-          packages = env-with-sim.nativeBuildInputs ++ [lrPkgs.lowrisc-toolchain-gcc-rv32imcb];
+        build-legacy-software = pkgs.mkShell {
+          name = "sonata-sw-legacy";
+          packages = [lrPkgs.lowrisc-toolchain-gcc-rv32imcb];
         };
       };
       packages = {