diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-05-12 23:14:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 23:14:45 +0200 |
| commit | c0427b5d06583d39b8efcd815083bd86c319a166 (patch) | |
| tree | 49063e0a8cefdc12ba77581ff7bf77bf8181b47b /pkgs | |
| parent | b3186b98608d0b9128b7ee8158c1e1bbadbad42a (diff) | |
| parent | e90057a4a56f6a9cc9ddb9fd7ed61ee1781e2651 (diff) | |
| download | nixpkgs-c0427b5d06583d39b8efcd815083bd86c319a166.tar nixpkgs-c0427b5d06583d39b8efcd815083bd86c319a166.tar.gz nixpkgs-c0427b5d06583d39b8efcd815083bd86c319a166.tar.bz2 nixpkgs-c0427b5d06583d39b8efcd815083bd86c319a166.tar.lz nixpkgs-c0427b5d06583d39b8efcd815083bd86c319a166.tar.xz nixpkgs-c0427b5d06583d39b8efcd815083bd86c319a166.tar.zst nixpkgs-c0427b5d06583d39b8efcd815083bd86c319a166.zip | |
Merge pull request #122769 from stephank/fix-chafa-darwin
chafa: fix darwin build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/chafa/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 51fbba8d706..d830b8d81fc 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -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 { version = "1.6.0"; @@ -23,7 +25,8 @@ stdenv.mkDerivation rec { 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d64dcc5f176..bb1280f84b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3658,7 +3658,9 @@ in 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 { }; |