Merge pull request #170799 from msfjarvis/hs/2022-04-28/ncdu-2.1.2

ncdu_2: 2.0 -> 2.1.2
This commit is contained in:
Sandro 2022-04-28 22:22:44 +02:00 committed by GitHub
commit 1bff69d371
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 24 deletions

View file

@ -1,17 +0,0 @@
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

@ -1,18 +1,14 @@
{ lib, stdenv, fetchurl, fetchpatch, zig, ncurses }:
{ lib, stdenv, fetchurl, zig, ncurses }:
stdenv.mkDerivation rec {
pname = "ncdu";
version = "2.0";
version = "2.1.2";
src = fetchurl {
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
sha256 = "sha256-Zs2mgEdnsukbeM/cqCX5/a9qCkxuQAYloBrVWVQYR8w=";
sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw=";
};
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 = [