From 86c02994a069ed37e6370192270731a27771aec3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 4 Apr 2024 15:29:33 +0200 Subject: [PATCH] sublime4: remove bash replacement Sublime 4050 already used `/usr/bin/env bash` in `exec.py` without any issue. --- .../applications/editors/sublime/4/common.nix | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 0fdf8f642e0e..a0fade07b1c5 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -23,9 +23,6 @@ curl, openssl_1_1, bzip2, - bash, - unzip, - zip, sqlite, }: @@ -82,30 +79,10 @@ let ]; nativeBuildInputs = [ - zip - unzip makeWrapper 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 = '' runHook preBuild @@ -132,10 +109,6 @@ let mkdir -p $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 '';