From 0230167a1798627bf37d66b127c3568b9e646559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 12 Jul 2021 18:25:09 -0400 Subject: [PATCH 1/3] ifstat: build on darwin --- pkgs/tools/networking/ifstat-legacy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 8383f82fd93c..014cce5ea4f1 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; - buildInputs = [ net-snmp ]; + buildInputs = lib.optional stdenv.isLinux net-snmp; nativeBuildInputs = [ autoreconfHook ]; From 7deb6b2aef27133c71381bb2683cd758824da55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 12 Jul 2021 18:20:11 -0400 Subject: [PATCH 2/3] bmon: build on darwin --- pkgs/tools/misc/bmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index ca5f99f3b62a..758a42d15385 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ncurses libconfuse libnl ]; + buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; preConfigure = '' # Must be an absolute path @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor pSub ]; }; } From 7cbefdda67d4c8c4c32d348712caef967c6fca33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 12 Jul 2021 18:00:18 -0400 Subject: [PATCH 3/3] gcal: depend on gettext on Darwin Without gettext the gcal binary crashes on macOS: $ ./src/gcal Illegal instruction: 4 --- pkgs/applications/misc/gcal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 28de8e0eceae..da190218d095 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, fetchpatch }: +{ lib, stdenv, fetchurl, ncurses, gettext, fetchpatch }: stdenv.mkDerivation rec { pname = "gcal"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; meta = { description = "Program for calculating and printing calendars";