public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: cleanup some references to bash

This commit is contained in:
Jan Malakhovski 2018-09-04 21:13:00 +00:00
parent 7931d455a4
commit 4092708261
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -75,7 +75,7 @@ stdenv.mkDerivation {
preferLocalBuild = true;
inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin;
shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath;
shell = getBin shell + shell.shellPath or "";
gnugrep_bin = if nativeTools then "" else gnugrep;
inherit targetPrefix infixSalt;

2
pkgs/top-level/all-packages.nix
View File

@ -6222,7 +6222,7 @@ with pkgs;
### SHELLS
runtimeShell = "${runtimeShellPackage}/bin/bash";
runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}";
runtimeShellPackage = bash;
bash = lowPrio (callPackage ../shells/bash/4.4.nix { });