Merge pull request #56408 from Mic92/runtime-shell
treewide: use runtimeShell instead of stdenv.shell whenever possible
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
, pyperclip, six, pyparsing, vim
|
||||
, contextlib2 ? null, subprocess32 ? null
|
||||
, pytest, mock, which, fetchFromGitHub, glibcLocales
|
||||
, runtimeShell
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "cmd2";
|
||||
@@ -19,8 +20,8 @@ buildPythonPackage rec {
|
||||
postPatch = stdenv.lib.optional stdenv.isDarwin ''
|
||||
# Fake the impure dependencies pbpaste and pbcopy
|
||||
mkdir bin
|
||||
echo '#${stdenv.shell}' > bin/pbpaste
|
||||
echo '#${stdenv.shell}' > bin/pbcopy
|
||||
echo '#${runtimeShell}' > bin/pbpaste
|
||||
echo '#${runtimeShell}' > bin/pbcopy
|
||||
chmod +x bin/{pbcopy,pbpaste}
|
||||
export PATH=$(realpath bin):$PATH
|
||||
'';
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
, openpyxl
|
||||
, tables
|
||||
, xlwt
|
||||
, runtimeShell
|
||||
, libcxx ? null
|
||||
}:
|
||||
|
||||
@@ -97,8 +98,8 @@ in buildPythonPackage rec {
|
||||
# Until then we disable the tests.
|
||||
+ optionalString isDarwin ''
|
||||
# Fake the impure dependencies pbpaste and pbcopy
|
||||
echo "#!${stdenv.shell}" > pbcopy
|
||||
echo "#!${stdenv.shell}" > pbpaste
|
||||
echo "#!${runtimeShell}" > pbcopy
|
||||
echo "#!${runtimeShell}" > pbpaste
|
||||
chmod a+x pbcopy pbpaste
|
||||
export PATH=$(pwd):$PATH
|
||||
'' + ''
|
||||
|
||||
Reference in New Issue
Block a user