sublime4: remove bash replacement
Sublime 4050 already used `/usr/bin/env bash` in `exec.py` without any issue.
This commit is contained in:
parent
e2d93cb47e
commit
86c02994a0
@ -23,9 +23,6 @@
|
|||||||
curl,
|
curl,
|
||||||
openssl_1_1,
|
openssl_1_1,
|
||||||
bzip2,
|
bzip2,
|
||||||
bash,
|
|
||||||
unzip,
|
|
||||||
zip,
|
|
||||||
sqlite,
|
sqlite,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -82,30 +79,10 @@ let
|
|||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
zip
|
|
||||||
unzip
|
|
||||||
makeWrapper
|
makeWrapper
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
# make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash"
|
|
||||||
patchPhase = ''
|
|
||||||
runHook prePatch
|
|
||||||
|
|
||||||
# TODO: Should not be necessary even in 3
|
|
||||||
mkdir Default.sublime-package-fix
|
|
||||||
( cd Default.sublime-package-fix
|
|
||||||
unzip -q ../Packages/Default.sublime-package
|
|
||||||
substituteInPlace "exec.py" --replace \
|
|
||||||
"[\"/bin/bash\"" \
|
|
||||||
"[\"$out/sublime_bash\""
|
|
||||||
zip -q ../Packages/Default.sublime-package **/*
|
|
||||||
)
|
|
||||||
rm -r Default.sublime-package-fix
|
|
||||||
|
|
||||||
runHook postPatch
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
|
|
||||||
@ -132,10 +109,6 @@ let
|
|||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -r * $out/
|
cp -r * $out/
|
||||||
|
|
||||||
# We can't just call /usr/bin/env bash because a relocation error occurs
|
|
||||||
# when trying to run a build from within Sublime Text
|
|
||||||
ln -s ${bash}/bin/bash $out/sublime_bash
|
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user