diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index 9af958ac6723..3cf636be8240 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -19,24 +19,28 @@ cargo, rustPlatform, rustc, + libunistring, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lnav"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; - rev = "v${version}"; - sha256 = "sha256-m0r7LAo9pYFpS+oimVCNCipojxPzMMsLLjhjkitEwow="; + tag = "v${finalAttrs.version}"; + hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI="; }; enableParallelBuilding = true; + separateDebugInfo = true; strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoconf automake @@ -47,6 +51,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustc ]; + buildInputs = [ bzip2 @@ -56,14 +61,15 @@ stdenv.mkDerivation rec { sqlite curl libarchive + libunistring ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gpm ]; cargoDeps = rustPlatform.fetchCargoVendor { - src = "${src}/src/third-party/prqlc-c"; - hash = "sha256-jfmr6EuNW2mEHTEVHn6YnBDMzKxKI097vEFHXC4NT2Y="; + src = "${finalAttrs.src}/src/third-party/prqlc-c"; + hash = "sha256-svi+C3ELw6Ly0mtji8xOv+DDqR0z5shFNazHa3kDQVg="; }; cargoRoot = "src/third-party/prqlc-c"; @@ -74,7 +80,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/tstack/lnav"; description = "Logfile Navigator"; longDescription = '' @@ -87,14 +93,13 @@ stdenv.mkDerivation rec { will allow the user to quickly and efficiently zero in on problems. ''; downloadPage = "https://github.com/tstack/lnav/releases"; - license = licenses.bsd2; - maintainers = with maintainers; [ + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ dochang symphorien pcasaretto ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "lnav"; }; - -} +})