From 630ab79197166b126bc8db1ceee73a6938ded449 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 20 Jan 2018 01:34:45 +0100
Subject: [PATCH] bash: remove shell wrapper
---
modules/programs/bash.nix | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index ee133772..0e116ae5 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -3,18 +3,7 @@
with lib;
let
-
cfg = config.programs.bash;
-
- shell = pkgs.runCommand pkgs.bashInteractive.name
- { buildInputs = [ pkgs.makeWrapper ]; }
- ''
- source $stdenv/setup
-
- mkdir -p $out/bin
- makeWrapper ${pkgs.bashInteractive}/bin/bash $out/bin/bash
- '';
-
in
{
@@ -56,8 +45,8 @@ in
"/share/bash-completion/completions"
];
- environment.loginShell = mkDefault "${shell}/bin/bash -l";
- environment.variables.SHELL = mkDefault "${shell}/bin/bash";
+ environment.loginShell = mkDefault "bash -l";
+ environment.variables.SHELL = mkDefault "${pkgs.bashInteractive}/bin/bash";
environment.etc."bashrc".text = ''
# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.