From cb17493a016e6ceeca3b3725bd0349fecdd8ba69 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 29 Nov 2025 11:46:05 +0200 Subject: [PATCH] ranger: move non-Python deps into the wrapper args - dropped less, cuz it's already patched in preConfigure - added coreutils and bash for `scope.sh` to work (can't patch or wrap the script itself, because Ranger both uses it internally and installs it in .config/ranger) --- pkgs/by-name/ra/ranger/package.nix | 31 +++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 5ea3652ecda8..05f1efb584d6 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -3,6 +3,8 @@ fetchFromGitHub, python3Packages, file, + coreutils, + bashNonInteractive, less, highlight, w3m, @@ -32,15 +34,26 @@ python3Packages.buildPythonApplication { astroid pylint ]; - propagatedBuildInputs = [ - less - file - ] - ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] - ++ lib.optionals sixelPreviewSupport [ imagemagick ] - ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] - ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] - ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; + propagatedBuildInputs = + [ ] + ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] + ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] + ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] + ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath ( + [ + file + coreutils + bashNonInteractive + ] + ++ lib.optionals sixelPreviewSupport [ imagemagick ] + )) + ]; preConfigure = '' ${lib.optionalString (highlight != null) ''