ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

bash: change shell script option types from string to lines

Browse Source 
installation-cd-base: export mountPoint=/mnt. This doesn't change the default behavior, but an explicit
mount point specification is cleaner.
This commit is contained in:
Marc Weber 2013-04-23 03:06:59 +02:00 committed by Evgeny Egorochkin
parent d97ea69a81
commit 2fcd1195e6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -32,4 +32,6 @@ with pkgs.lib;
# To speed up installation a little bit, include the complete stdenv # To speed up installation a little bit, include the complete stdenv
# in the Nix store on the CD. # in the Nix store on the CD.
isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ]; isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
environment.shellInit = "export mountPoint=/mnt";
} }

6
modules/programs/bash/bash.nix
View File

@ -46,7 +46,7 @@ let
description = '' description = ''
Shell script code used to initialise the shell prompt. Shell script code used to initialise the shell prompt.
''; '';
type = with pkgs.lib.types; string; type = with pkgs.lib.types; lines;
}; };
environment.shellInit = mkOption { environment.shellInit = mkOption {
@ -55,7 +55,7 @@ let
description = '' description = ''
Shell script code called during login shell initialisation. Shell script code called during login shell initialisation.
''; '';
type = with pkgs.lib.types; string; type = with pkgs.lib.types; lines;
}; };
environment.interactiveShellInit = mkOption { environment.interactiveShellInit = mkOption {
@ -64,7 +64,7 @@ let
description = '' description = ''
Shell script code called during interactive shell initialisation. Shell script code called during interactive shell initialisation.
''; '';
type = with pkgs.lib.types; string; type = with pkgs.lib.types; lines;
}; };
environment.enableBashCompletion = mkOption { environment.enableBashCompletion = mkOption {