summary refs log tree commit diff
path: root/pkgs/applications/misc/nnn
diff options
context:
space:
mode:
authormidchildan <git@midchildan.org>2021-04-19 01:24:14 +0900
committermidchildan <git@midchildan.org>2021-04-22 00:49:43 +0900
commitf36aca9e821a083f31a11d2fa8eb4afc4a32c478 (patch)
treee7bdc2ea304be3d9137c0c2b62489b054365ad4c /pkgs/applications/misc/nnn
parentf71101e0c74a13763ca4acf7676cf66a479d0894 (diff)
downloadnixpkgs-f36aca9e821a083f31a11d2fa8eb4afc4a32c478.tar
nixpkgs-f36aca9e821a083f31a11d2fa8eb4afc4a32c478.tar.gz
nixpkgs-f36aca9e821a083f31a11d2fa8eb4afc4a32c478.tar.bz2
nixpkgs-f36aca9e821a083f31a11d2fa8eb4afc4a32c478.tar.lz
nixpkgs-f36aca9e821a083f31a11d2fa8eb4afc4a32c478.tar.xz
nixpkgs-f36aca9e821a083f31a11d2fa8eb4afc4a32c478.tar.zst
nixpkgs-f36aca9e821a083f31a11d2fa8eb4afc4a32c478.zip
nnn: don't make supported tools a requirement
Fixes #119728.
Diffstat (limited to 'pkgs/applications/misc/nnn')
-rw-r--r--pkgs/applications/misc/nnn/default.nix34
1 files changed, 23 insertions, 11 deletions
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 6fd68779f4f..3b482e95d9d 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -1,6 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, ncurses, readline
-, archivemount, atool, fzf, libarchive, rclone, sshfs, unzip, vlock
-, conf ? null, withIcons ? false, withNerdIcons ? false }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, installShellFiles
+, makeWrapper
+, pkg-config
+, file
+, ncurses
+, readline
+, which
+# options
+, conf ? null
+, withIcons ? false
+, withNerdIcons ? false
+}:
 
 # Mutually exclusive options
 assert withIcons -> withNerdIcons == false;
@@ -20,21 +32,21 @@ stdenv.mkDerivation rec {
   configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
   preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h";
 
-  nativeBuildInputs = [ pkg-config makeWrapper ];
+  nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ];
   buildInputs = [ readline ncurses ];
 
-  makeFlags = [ "PREFIX=$(out)" ]
+  makeFlags = [ "PREFIX=${placeholder "out"}" ]
     ++ lib.optional withIcons [ "O_ICONS=1" ]
     ++ lib.optional withNerdIcons [ "O_NERD=1" ];
 
-  # shell completions
+  binPath = lib.makeBinPath [ file which ];
+
   postInstall = ''
-    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
+    installShellCompletion --bash --name nnn.bash misc/auto-completion/bash/nnn-completion.bash
+    installShellCompletion --fish misc/auto-completion/fish/nnn.fish
+    installShellCompletion --zsh misc/auto-completion/zsh/_nnn
 
-    wrapProgram $out/bin/nnn \
-      --prefix PATH : ${lib.makeBinPath [ archivemount atool fzf libarchive rclone sshfs unzip vlock ]}
+    wrapProgram $out/bin/nnn --prefix PATH : "$binPath"
   '';
 
   meta = with lib; {