Merge staging-next into staging

2021-05-15 06:22:25 +00:00
parent 2e55b7301b c48794dcef
commit 78ae7ac75e
84 changed files with 2099 additions and 1505 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";