From f5f48d318bd0d3eb8cc4cb188dad3bf4853cd0d9 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 8 Apr 2024 20:42:44 -0400 Subject: [PATCH] shell.nix: Use default.nix as source of truth --- shell.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/shell.nix b/shell.nix index 3edc710..3c53621 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,18 @@ -with import {}; -mkShell { - nativeBuildInputs = [ grub2_efi inkscape imagemagick ]; - dejavu = dejavu_fonts; - __strictDeps = true; -} +{ pkgs ? import {} }: + +let + default = import ./. { inherit pkgs; }; +in +pkgs.callPackage ( + { mkShell + , dejavu_fonts + }: + mkShell { + nativeBuildInputs = [] + ++ default.bootloader.nativeBuildInputs + ++ default.icons.nativeBuildInputs + ; + dejavu = dejavu_fonts; + __strictDeps = true; + } +) {}