Merge pull request #204698 from wegank/zbar-darwin

zbar: fix build on darwin
This commit is contained in:
Pierre Bourdon 2022-12-06 02:56:38 +01:00 committed by GitHub
commit 477580bb20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View file

@ -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 [

View file

@ -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;
};