Unverified Commit 3bfb704e authored by Theodore Ni's avatar Theodore Ni Committed by GitHub
Browse files

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

parents 74de84cd 7ed598dc

pkgs/applications/editors/mg/default.nix

+3 −3
Original line number Diff line number Diff line 
{ 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";

pkgs/applications/science/logic/surelog/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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"

pkgs/applications/science/logic/uhdm/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -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 = [

pkgs/applications/version-management/fnc/default.nix

+4 −2
Original line number Diff line number Diff line 
{ 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)" ];

pkgs/tools/misc/abduco/default.nix

+5 −1
Original line number Diff line number Diff line 
{ 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 {