From bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 6 Jul 2021 12:57:53 +0000 Subject: shells/linux: extend C shell --- shells/linux.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'shells') diff --git a/shells/linux.nix b/shells/linux.nix index 8b5eb976e344..1cdbbc50baa1 100644 --- a/shells/linux.nix +++ b/shells/linux.nix @@ -1,23 +1,16 @@ -{ pkgs ? import ../. {} }: +{ pkgs ? import ../. {} } @ args: with pkgs; -stdenv.mkDerivation { +(import ./c.nix args).overrideAttrs ({ buildInputs ? [], ... }: { name = "linux-shell"; - buildInputs = [ - bison flex bc elfutils openssl + buildInputs = buildInputs ++ [ + elfutils openssl # For make {n,menu}config - ncurses pkgconfig - - # For LSP - clang-tools + ncurses # For documentation graphviz imagemagick python3Packages.sphinx python3Packages.sphinx_rtd_theme texlive.combined.scheme-minimal ]; - - buildCommand = '' - printf "%s\n" $buildInputs > $out - ''; -} +}) -- cgit 1.4.1