Merge pull request #152163 from Atemu/update/ncdu

This commit is contained in:
Sandro 2022-04-08 15:14:19 +02:00 committed by GitHub
commit ece776133d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 0 deletions

View file

@ -0,0 +1,17 @@
diff --git a/src/ui.zig b/src/ui.zig
index 8401910..50171a7 100644
--- a/src/ui.zig
+++ b/src/ui.zig
@@ -8,11 +8,11 @@ const main = @import("main.zig");
const util = @import("util.zig");
pub const c = @cImport({
+ @cDefine("_XOPEN_SOURCE", "1");
@cInclude("stdio.h");
@cInclude("string.h");
@cInclude("curses.h");
@cInclude("time.h");
- @cDefine("_X_OPEN_SOURCE", "1");
@cInclude("wchar.h");
@cInclude("locale.h");
});

View file

@ -0,0 +1,33 @@
{ lib, stdenv, fetchurl, fetchpatch, zig, ncurses }:
stdenv.mkDerivation rec {
pname = "ncdu";
version = "2.0";
src = fetchurl {
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
sha256 = "sha256-Zs2mgEdnsukbeM/cqCX5/a9qCkxuQAYloBrVWVQYR8w=";
};
patches = [
./c-import-order.patch # https://code.blicky.net/yorhel/ncdu/issues/183
];
XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv
nativeBuildInputs = [
zig
];
buildInputs = [ ncurses ];
PREFIX = placeholder "out";
meta = with lib; {
description = "Disk usage analyzer with an ncurses interface";
homepage = "https://dev.yorhel.nl/ncdu";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ pSub SuperSandro2000 ];
};
}

View file

@ -28130,6 +28130,7 @@ with pkgs;
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
ncdu = callPackage ../tools/misc/ncdu { };
ncdu_2 = callPackage ../tools/misc/ncdu_2 { };
ncdc = callPackage ../applications/networking/p2p/ncdc { };