mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-14 05:37:40 +03:00
Merge pull request #130059 from smancill/fix-darwin-packages
Fix packages on Darwin
This commit is contained in:
commit
af6bbe9aaf
@ -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";
|
||||
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5";
|
||||
};
|
||||
|
||||
buildInputs = [ net-snmp ];
|
||||
buildInputs = lib.optional stdenv.isLinux net-snmp;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user