From 6a0bff977a6b2052d3ce37cb3ea3858d5f69c6c9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 3 Jan 2019 20:25:25 -0600 Subject: [PATCH 1/2] nnn: remove readline, not used since 1.9 --- pkgs/applications/misc/nnn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 1c1fd292e5d..34a365ab67f 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, conf ? null }: with stdenv.lib; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses readline ]; + buildInputs = [ ncurses ]; - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; meta = { description = "Small ncurses-based file browser forked from noice"; From e07488d2a0feb8e29e09249b9b885e56f29e5c2c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 3 Jan 2019 20:32:23 -0600 Subject: [PATCH 2/2] nnn: install shell completions --- pkgs/applications/misc/nnn/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 34a365ab67f..9eb5382cde9 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + # shell completions + postInstall = '' + install -Dm555 scripts/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash + install -Dm555 scripts/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions + install -Dm555 scripts/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d + ''; + meta = { description = "Small ncurses-based file browser forked from noice"; homepage = https://github.com/jarun/nnn;