about summary refs log tree commit diff
path: root/shells
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-06 12:57:53 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-06 13:10:09 +0000
commitbde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8 (patch)
treeb057ddb9958d11784ed970ce586cbe758d59ab9c /shells
parent3d8a2d9e283f700433ce6098255ca36d0dad6f2a (diff)
downloadnixlib-bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8.tar
nixlib-bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8.tar.gz
nixlib-bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8.tar.bz2
nixlib-bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8.tar.lz
nixlib-bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8.tar.xz
nixlib-bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8.tar.zst
nixlib-bde46120d24a17f3abc7f6aa68fdd4bc1f4ca8e8.zip
shells/linux: extend C shell
Diffstat (limited to 'shells')
-rw-r--r--shells/linux.nix19
1 files changed, 6 insertions, 13 deletions
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
-  '';
-}
+})