Merge pull request #130059 from smancill/fix-darwin-packages

Fix packages on Darwin

authored by

Domen Kožar and committed by
GitHub
af6bbe9a 78161623

+5 -5
+2 -2
pkgs/applications/misc/gcal/default.nix
··· 1 - { lib, stdenv, fetchurl, ncurses, fetchpatch }: 2 3 stdenv.mkDerivation rec { 4 pname = "gcal"; ··· 18 19 enableParallelBuilding = true; 20 21 - buildInputs = [ ncurses ]; 22 23 meta = { 24 description = "Program for calculating and printing calendars";
··· 1 + { lib, stdenv, fetchurl, ncurses, gettext, fetchpatch }: 2 3 stdenv.mkDerivation rec { 4 pname = "gcal"; ··· 18 19 enableParallelBuilding = true; 20 21 + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; 22 23 meta = { 24 description = "Program for calculating and printing calendars";
+2 -2
pkgs/tools/misc/bmon/default.nix
··· 14 15 nativeBuildInputs = [ autoreconfHook pkg-config ]; 16 17 - buildInputs = [ ncurses libconfuse libnl ]; 18 19 preConfigure = '' 20 # Must be an absolute path ··· 28 # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD 29 # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT 30 license = licenses.bsd2; 31 - platforms = platforms.linux; 32 maintainers = with maintainers; [ bjornfor pSub ]; 33 }; 34 }
··· 14 15 nativeBuildInputs = [ autoreconfHook pkg-config ]; 16 17 + buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; 18 19 preConfigure = '' 20 # Must be an absolute path ··· 28 # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD 29 # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT 30 license = licenses.bsd2; 31 + platforms = platforms.unix; 32 maintainers = with maintainers; [ bjornfor pSub ]; 33 }; 34 }
+1 -1
pkgs/tools/networking/ifstat-legacy/default.nix
··· 9 sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; 10 }; 11 12 - buildInputs = [ net-snmp ]; 13 14 nativeBuildInputs = [ autoreconfHook ]; 15
··· 9 sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; 10 }; 11 12 + buildInputs = lib.optional stdenv.isLinux net-snmp; 13 14 nativeBuildInputs = [ autoreconfHook ]; 15