From 786a6094962bae771c9f7f085deefd0a7e157876 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Tue, 26 Apr 2022 13:43:58 +0200 Subject: [PATCH] ranger: add optional python dependencies (#170328) * ranger: add optional python dependencies Ranger has some [optional python dependencies](https://github.com/ranger/ranger#dependencies). Also, for use with the rnvimr NeoVim plugin, the pynvim packgage needs to be included. * Update pkgs/applications/misc/ranger/default.nix Apply PR suggestion Co-authored-by: Sandro * Update pkgs/applications/misc/ranger/default.nix Apply PR suggestion Co-authored-by: Sandro Co-authored-by: Marc Jakobi Co-authored-by: Sandro --- pkgs/applications/misc/ranger/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 4bd8a182d6f1..95f85430ba0b 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,5 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight -, imagePreviewSupport ? true, w3m }: +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m +, imagePreviewSupport ? true +, neoVimSupport ? true +, improvedEncodingDetection ? true +, rightToLeftTextSupport ? false +}: python3Packages.buildPythonApplication rec { pname = "ranger"; @@ -15,8 +19,13 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = with python3Packages; [ pytestCheckHook ]; - propagatedBuildInputs = [ file ] - ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; + propagatedBuildInputs = [ + less + file + ] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] + ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] + ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] + ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; preConfigure = '' ${lib.optionalString (highlight != null) ''