From d09c84aa00996fef4f281d05829fdaf40bb84616 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 2 May 2020 13:33:29 +0900 Subject: [PATCH] exiv2: fix build on 32-bit arm --- pkgs/development/libraries/exiv2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a192a4c2cab6..8a6dfd1983ef 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -79,8 +79,9 @@ stdenv.mkDerivation rec { mkdir ../test/tmp export LD_LIBRARY_PATH="$(realpath ../build/lib)" - # Fix tests on Aarch64 - ${stdenv.lib.optionalString stdenv.isAarch64 '' + ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' + # Fix tests on arm + # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''}