From 75d107c276a5118e021159ecd571c23f42c2f975 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 23 Nov 2024 12:00:00 +0000 Subject: [PATCH 1/4] lnav: reformat --- pkgs/by-name/ln/lnav/package.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index 4933e0879628..97d3bb182d45 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, pcre2 -, sqlite -, ncurses -, readline -, zlib -, bzip2 -, autoconf -, automake -, curl -, buildPackages -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + pcre2, + sqlite, + ncurses, + readline, + zlib, + bzip2, + autoconf, + automake, + curl, + buildPackages, + nix-update-script, }: stdenv.mkDerivation rec { From 62b205eff53af584754c4f96c103bd0d210ca3d3 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 23 Nov 2024 12:00:00 +0000 Subject: [PATCH 2/4] lnav: add missing optional dependencies they are probed by ./configure --- pkgs/by-name/ln/lnav/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index 97d3bb182d45..29b3c3bc530f 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -12,6 +12,9 @@ automake, curl, buildPackages, + re2c, + gpm, + libarchive, nix-update-script, }: @@ -35,6 +38,7 @@ stdenv.mkDerivation rec { automake zlib curl.dev + re2c ]; buildInputs = [ bzip2 @@ -43,6 +47,8 @@ stdenv.mkDerivation rec { readline sqlite curl + gpm + libarchive ]; preConfigure = '' From 439337b9e6941fa07799402e537b29aa41881158 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 23 Nov 2024 12:00:00 +0000 Subject: [PATCH 3/4] lnav: enable debug symbols lnav crashes more than the average program, let's say --- pkgs/by-name/ln/lnav/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index 29b3c3bc530f..bb01473eac89 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; + separateDebugInfo = true; strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; From ffbe28a0202f10d817d8c22dc7b98b9d6096bd65 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 23 Nov 2024 12:00:00 +0000 Subject: [PATCH 4/4] lnav: adopt --- pkgs/by-name/ln/lnav/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index bb01473eac89..e498376f1db3 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -72,7 +72,10 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - maintainers = with maintainers; [ dochang ]; + maintainers = with maintainers; [ + dochang + symphorien + ]; platforms = platforms.unix; mainProgram = "lnav"; };