various: fix darwin builds by adding libutil dependency (#352912)

This commit is contained in:
Theodore Ni
2024-11-02 10:40:01 -07:00
committed by GitHub
7 changed files with 22 additions and 9 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }:
{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages, darwin }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "mg";
version = "7.3-unstable-2024-06-04";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ];
buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ];
meta = with lib; {
description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
@@ -12,6 +12,7 @@
, antlr4
, capnproto
, nlohmann_json
, darwin
}:
stdenv.mkDerivation (finalAttrs: {
@@ -45,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
capnproto
antlr4.runtime.cpp
nlohmann_json
];
] ++ lib.optional stdenv.isDarwin [ darwin.libutil ];
cmakeFlags = [
"-DSURELOG_USE_HOST_CAPNP=On"
@@ -5,6 +5,7 @@
, python3
, capnproto
, gtest
, darwin
}:
stdenv.mkDerivation (finalAttrs: {
@@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
capnproto
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libutil
];
cmakeFlags = [
@@ -1,4 +1,4 @@
{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }:
{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, darwin }:
stdenv.mkDerivation (finalAttrs: {
pname = "fnc";
@@ -9,7 +9,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk=";
};
buildInputs = [ libiconv ncurses zlib ];
buildInputs = [ libiconv ncurses zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libutil
];
makeFlags = [ "PREFIX=$(out)" ];
+5 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchpatch, fetchzip, writeText, conf ? null }:
{ lib, stdenv, fetchpatch, fetchzip, writeText, darwin, conf ? null }:
let
rev = "8c32909a159aaa9484c82b71f05b7a73321eb491";
@@ -21,6 +21,10 @@ stdenv.mkDerivation {
installFlags = [ "install-completion" ];
CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libutil
];
patches = [
# https://github.com/martanne/abduco/pull/22
(fetchpatch {
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ncurses }:
{ lib, stdenv, fetchFromGitHub, ncurses, darwin }:
stdenv.mkDerivation rec {
pname = "mtm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv";
};
buildInputs = [ ncurses ];
buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ darwin.libutil ];
makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ];
@@ -8,6 +8,7 @@
, protobuf
, zlib
, catch2
, darwin
}:
stdenv.mkDerivation rec {
@@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
openssl
protobuf
zlib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libutil
];
preBuild = ''