From 5c3a1c28086b8d4f1443fb39d6c4bd26e2e2c7a6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 13 Apr 2021 09:38:37 +0300 Subject: [PATCH] =?UTF-8?q?nnn:=203.6=20=E2=86=92=204.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/nnn/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index a39e8267cf7..6fd68779f4f 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, ncurses, readline +, archivemount, atool, fzf, libarchive, rclone, sshfs, unzip, vlock , conf ? null, withIcons ? false, withNerdIcons ? false }: # Mutually exclusive options @@ -7,19 +8,19 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.6"; + version = "4.0"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "1hwv7ncp8pmzdir30877ni4qlmczmb3yjdkbfd1pssr08y1srsc7"; + sha256 = "0cbxgss9j0bvsp3czjx1kpm9id7c5xxmjfnvjyk3pfd69ygif2kl"; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ readline ncurses ]; makeFlags = [ "PREFIX=$(out)" ] @@ -31,6 +32,9 @@ stdenv.mkDerivation rec { install -Dm555 misc/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash install -Dm555 misc/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d + + wrapProgram $out/bin/nnn \ + --prefix PATH : ${lib.makeBinPath [ archivemount atool fzf libarchive rclone sshfs unzip vlock ]} ''; meta = with lib; {