From 1e5145a0fad64518f1d3982a43e237e7ce34d6c3 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Sun, 29 Oct 2023 19:39:28 +0100
Subject: [PATCH] nix: trim down shell environment

---
 flake.nix | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2e1abdd..61a98c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -228,31 +228,23 @@
           };
 
           devShells.default = pkgs.mkShell {
-            shellHook =
-              let
-                systemdUkify = pkgs.systemdMinimal.override {
-                  withEfi = true;
-                  withBootloader = true;
-                  withUkify = true;
-                };
-              in
-              ''
-                ${config.pre-commit.installationScript}
-                export PATH=$PATH:${systemdUkify}/lib/systemd
-              '';
+            shellHook = ''
+              ${config.pre-commit.installationScript}
+            '';
 
             packages = [
-              pkgs.uefi-run
-              pkgs.openssl
-              (pkgs.sbctl.override { databasePath = "pki"; })
-              pkgs.sbsigntool
-              pkgs.efitools
-              pkgs.python39Packages.ovmfvartool
-              pkgs.qemu
               pkgs.nixpkgs-fmt
               pkgs.statix
               pkgs.cargo-release
               pkgs.cargo-machete
+
+              # Convenience for test fixtures in nix/tests.
+              pkgs.openssl
+              (pkgs.sbctl.override { databasePath = "pki"; })
+
+              # Needed for `cargo test` in rust/tool. We also need
+              # TEST_SYSTEMD below for that.
+              pkgs.sbsigntool
             ];
 
             inputsFrom = [