From 248ecb11af9a5ebc6259f082c630197efd1730f3 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 8 Jun 2024 16:57:08 +0200 Subject: [PATCH] dev shell: Add bashInteractive This was bothersome to me as a zsh+direnv user. Change-Id: Ia5b54cc63647a5c6ced2b5412e972dac1abf8184 --- package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/package.nix b/package.nix index 02bb1d3cd..f65611ea6 100644 --- a/package.nix +++ b/package.nix @@ -390,16 +390,20 @@ stdenv.mkDerivation (finalAttrs: { mkDevShell = { mkShell, - just, - nixfmt, - glibcLocales, - pre-commit-checks, + + bashInteractive, clang-tools, - llvmPackages, clangbuildanalyzer, - contribNotice, + glibcLocales, + just, + llvmPackages, + nixfmt, skopeo, xonsh, + + # Lix specific packages + pre-commit-checks, + contribNotice, }: let glibcFix = lib.optionalAttrs (buildPlatform.isLinux && glibcLocales != null) { @@ -446,6 +450,10 @@ stdenv.mkDerivation (finalAttrs: { packages = lib.optional (stdenv.cc.isClang && hostPlatform == buildPlatform) clang-tools ++ [ + # Why are we providing a bashInteractive? Well, when you run + # `bash` from inside `nix develop`, say, because you are using it + # via direnv, you will by default get bash (unusable edition). + bashInteractive pythonEnv # docker image tool skopeo