From ff3249c5144b59d26096b70d0919fc830ba087cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 10 Mar 2023 10:41:22 +0100 Subject: [PATCH] nix: add procps to default shell, and tcl for darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cocoapod installations can fail with errors like: ``` tclsh /Users/jenkins/Library/Caches/CocoaPods/Pods/Release/SQLCipher/3.4.2-f9fcf/tool/addopcodes.tcl parse.h.temp >parse.h ./configure: line 11729: tclsh: command not found ./configure: line 12262: tclsh: command not found ./configure: line 12276: tclsh: command not found ``` If a pure shell is used. Also `pgrep` would be missing from a pure shell. Signed-off-by: Jakub SokoĊ‚owski --- nix/shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/shell.nix b/nix/shell.nix index 4d36cbe2e2..e007e13292 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -12,7 +12,7 @@ in mkShell { buildInputs = with pkgs; lib.unique ([ # core utilities that should always be present in a shell - bash curl wget file unzip flock + bash curl wget file unzip flock procps git gnumake jq ncurses gnugrep parallel lsof # used in start-react-native.sh # build specific utilities @@ -22,7 +22,7 @@ in mkShell { # other nice to have stuff yarn nodejs python27 ] # and some special cases - ++ lib.optionals stdenv.isDarwin [ cocoapods clang ] + ++ lib.optionals stdenv.isDarwin [ cocoapods clang tcl ] ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ] );