diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-09 00:02:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 00:02:46 +0000 |
| commit | 1c0ef46804d0c6edecf281507ec1aa63bc8a130a (patch) | |
| tree | f0276b59fb704353368c856b33fef0aa5674fd12 /pkgs/tools/graphics | |
| parent | 60b28ae00d2defbe9e1fdb7b9ceb583ebc4270b5 (diff) | |
| parent | 34fde40edd9bf8a8f071cfbfd05965921b16bf66 (diff) | |
| download | nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.gz nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.bz2 nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.lz nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.xz nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.tar.zst nixpkgs-1c0ef46804d0c6edecf281507ec1aa63bc8a130a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/scanbd/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 2f2d0523469..3f2331a0de0 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { "--enable-udev" "--with-scanbdconfdir=/etc/scanbd" "--with-systemdsystemunitdir=$out/lib/systemd/system" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" ]; enableParallelBuilding = true; |