public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116464 from sikmir/nnn 

nnn: 3.5 → 3.6
This commit is contained in:
Sandro 2021-03-16 12:32:02 +01:00 committed by GitHub
parent 73be16c314 6229fa2dd7
commit 9171992330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/nnn/default.nix
View File

@ -7,13 +7,13 @@ assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nnn"; pname = "nnn";
version = "3.5"; version = "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jarun"; owner = "jarun";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy"; sha256 = "1hwv7ncp8pmzdir30877ni4qlmczmb3yjdkbfd1pssr08y1srsc7";
}; };
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
@ -22,10 +22,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ readline ncurses ]; buildInputs = [ readline ncurses ];
makeFlags = [ makeFlags = [ "PREFIX=$(out)" ]
"DESTDIR=${placeholder "out"}" ++ lib.optional withIcons [ "O_ICONS=1" ]
"PREFIX="
] ++ lib.optional withIcons [ "O_ICONS=1" ]
++ lib.optional withNerdIcons [ "O_NERD=1" ]; ++ lib.optional withNerdIcons [ "O_NERD=1" ];
# shell completions # shell completions
@ -38,6 +36,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Small ncurses-based file browser forked from noice"; description = "Small ncurses-based file browser forked from noice";
homepage = "https://github.com/jarun/nnn"; homepage = "https://github.com/jarun/nnn";
changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG";
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; maintainers = with maintainers; [ jfrankenau Br1ght0ne ];