Unverified Commit 477580bb authored by Pierre Bourdon's avatar Pierre Bourdon Committed by GitHub
Browse files

Merge pull request #204698 from wegank/zbar-darwin 

zbar: fix build on darwin
parents 00a3de61 4619e1c0

pkgs/tools/graphics/zbar/default.nix

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

pkgs/top-level/all-packages.nix

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















  };