From 4619e1c05b5746f92c8af4635415aa2d0f9d3218 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Dec 2022 23:27:51 +0100 Subject: [PATCH] zbar: fix build on darwin --- pkgs/tools/graphics/zbar/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 4e850e4fe6c7..9bf4a281e062 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -22,6 +22,8 @@ # see https://github.com/mchehab/zbar/issues/104 , enableDbus ? false , libintl +, libiconv +, Foundation }: stdenv.mkDerivation rec { @@ -50,6 +52,9 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig libintl + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + Foundation ] ++ lib.optionals enableDbus [ dbus ] ++ lib.optionals withXorg [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87376adb55f1..434014ebfe30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13307,6 +13307,7 @@ with pkgs; zbackup = callPackage ../tools/backup/zbackup {}; zbar = libsForQt5.callPackage ../tools/graphics/zbar { + inherit (darwin.apple_sdk.frameworks) Foundation; autoreconfHook = buildPackages.autoreconfHook269; };