diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-05 00:15:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 00:15:45 +0200 |
| commit | 374433bcfbc81c65d678189bd00ac97efb9b0a79 (patch) | |
| tree | 91c3d6cc485c083781a91ea214a0738ffc36c959 | |
| parent | ff5ffad72b51658840f9ab26252fd1a6ee7c7785 (diff) | |
| parent | 5ee40b84ccda195b6ed5264fa8b2713a856b6751 (diff) | |
| download | nixpkgs-374433bcfbc81c65d678189bd00ac97efb9b0a79.tar nixpkgs-374433bcfbc81c65d678189bd00ac97efb9b0a79.tar.gz nixpkgs-374433bcfbc81c65d678189bd00ac97efb9b0a79.tar.bz2 nixpkgs-374433bcfbc81c65d678189bd00ac97efb9b0a79.tar.lz nixpkgs-374433bcfbc81c65d678189bd00ac97efb9b0a79.tar.xz nixpkgs-374433bcfbc81c65d678189bd00ac97efb9b0a79.tar.zst nixpkgs-374433bcfbc81c65d678189bd00ac97efb9b0a79.zip | |
Merge pull request #253077 from misuzu/exiv2-armv7l
exiv2: fix build on armv7l-linux
| -rw-r--r-- | pkgs/development/libraries/exiv2/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index d1cd4894f1f..0c4c339c639 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -88,6 +88,12 @@ stdenv.mkDerivation rec { ''} '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' export LC_ALL=C + '' + lib.optionalString stdenv.isAarch32 '' + # these tests are fixed in 0.28, remove when updating to 0.28 + rm -f ../tests/bugfixes/github/test_issue_1503.py + rm -f ../tests/bugfixes/github/test_pr1475_AVIF.py + rm -f ../tests/bugfixes/github/test_pr1475_HEIC.py + rm -f ../tests/bugfixes/github/test_pr1475_HIF.py ''; # With CMake we have to enable samples or there won't be |