Merge remote-tracking branch 'origin/master' into staging-next

2021-05-14 21:57:09 -07:00
parent c48eaa70e3 72948af15b
commit 0546e68ef7
13 changed files with 107 additions and 25 deletions
@@ -5,6 +5,7 @@
 , pkg-config
 , libdmtx
 , imagemagick
+, Foundation
 }:

 stdenv.mkDerivation rec {
@@ -20,7 +21,8 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ autoreconfHook pkg-config ];

-  buildInputs = [ libdmtx imagemagick ];
+  buildInputs = [ libdmtx imagemagick ]
+    ++ lib.optional stdenv.isDarwin Foundation;

  meta = {
    description = "Data matrix command-line utilities";