public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chafa: fix darwin build

This commit is contained in:
Stéphan Kochen 2021-05-12 22:41:50 +02:00
parent 1299c42d88
commit e90057a4a5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/chafa/default.nix
View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which
, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick
, Foundation
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6.0"; version = "1.6.0";
@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
docbook_xsl docbook_xsl
]; ];
buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; buildInputs = [ glib imagemagick ]
++ lib.optional stdenv.isDarwin Foundation;
patches = [ ./xmlcatalog_patch.patch ]; patches = [ ./xmlcatalog_patch.patch ];

4
pkgs/top-level/all-packages.nix
View File

@ -3658,7 +3658,9 @@ in
cfssl = callPackage ../tools/security/cfssl { }; cfssl = callPackage ../tools/security/cfssl { };
chafa = callPackage ../tools/misc/chafa { }; chafa = callPackage ../tools/misc/chafa {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; checkbashisms = callPackage ../development/tools/misc/checkbashisms { };