From 6229fa2dd7aca60805bcf9b9bf7dbfabe73525e1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 15 Mar 2021 22:58:07 +0300 Subject: [PATCH] =?UTF-8?q?nnn:=203.5=20=E2=86=92=203.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/nnn/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 4a72eecf9b3..a39e8267cf7 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -7,13 +7,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy"; + sha256 = "1hwv7ncp8pmzdir30877ni4qlmczmb3yjdkbfd1pssr08y1srsc7"; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); @@ -22,10 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline ncurses ]; - makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=" - ] ++ lib.optional withIcons [ "O_ICONS=1" ] + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional withIcons [ "O_ICONS=1" ] ++ lib.optional withNerdIcons [ "O_NERD=1" ]; # shell completions @@ -38,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small ncurses-based file browser forked from noice"; homepage = "https://github.com/jarun/nnn"; + changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau Br1ght0ne ];