diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-19 08:57:54 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-01-19 19:10:47 +0100 |
| commit | 4f50411cfc6cb793479818dec6b88732474a4afe (patch) | |
| tree | 6b3e3d943ed88b3623d76cf8b4ca4af0bd478066 /pkgs/tools/misc/bmon | |
| parent | 00ae4c7fc46ac0fc0bd3ee9faa76e6e67d1c981c (diff) | |
| download | nixpkgs-4f50411cfc6cb793479818dec6b88732474a4afe.tar nixpkgs-4f50411cfc6cb793479818dec6b88732474a4afe.tar.gz nixpkgs-4f50411cfc6cb793479818dec6b88732474a4afe.tar.bz2 nixpkgs-4f50411cfc6cb793479818dec6b88732474a4afe.tar.lz nixpkgs-4f50411cfc6cb793479818dec6b88732474a4afe.tar.xz nixpkgs-4f50411cfc6cb793479818dec6b88732474a4afe.tar.zst nixpkgs-4f50411cfc6cb793479818dec6b88732474a4afe.zip | |
bmon: unbreak on aarch64-darwin
Diffstat (limited to 'pkgs/tools/misc/bmon')
| -rw-r--r-- | pkgs/tools/misc/bmon/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 52c06613296..e85c2b96bd3 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ncurses, libconfuse +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, ncurses, libconfuse , libnl }: stdenv.mkDerivation rec { @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf"; }; + # The source code defines `__unused__`, which is a reserved name + # https://github.com/tgraf/bmon/issues/89 + patches = [ + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/6d1dd5e9c8fae608bd22f3ede21e576f29c6358c/net/bmon/files/patch-fix__unused.diff"; + extraPrefix = ""; + sha256 = "sha256-UYIiJZzipsx9a0xabrKfyj8TWNW7IM77oXnVnSPkQkc="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; @@ -30,7 +40,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor pSub ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } |