diff options
author | Domen Kožar <domen@dev.si> | 2021-11-22 08:50:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-22 08:50:48 +0100 |
commit | 43a7d62e073e39dfe21b83c62720ff1c733e6ad3 (patch) | |
tree | ef1b720d1dfd2b746d071a2a251958c132dacc31 /pkgs/tools/archivers | |
parent | 14ca76d9d7898e245cfb992e34323ab8d4fce661 (diff) | |
parent | 7d6b3abe12c1c8b2e6f760ab82de80d087df57d8 (diff) | |
download | nixpkgs-43a7d62e073e39dfe21b83c62720ff1c733e6ad3.tar nixpkgs-43a7d62e073e39dfe21b83c62720ff1c733e6ad3.tar.gz nixpkgs-43a7d62e073e39dfe21b83c62720ff1c733e6ad3.tar.bz2 nixpkgs-43a7d62e073e39dfe21b83c62720ff1c733e6ad3.tar.lz nixpkgs-43a7d62e073e39dfe21b83c62720ff1c733e6ad3.tar.xz nixpkgs-43a7d62e073e39dfe21b83c62720ff1c733e6ad3.tar.zst nixpkgs-43a7d62e073e39dfe21b83c62720ff1c733e6ad3.zip |
Merge pull request #146843 from arkivm/darwin-fixes-arc_unpacker
arc_unpacker: Move to catch2 to support aarch64-darwin
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/arc_unpacker/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index edf67f2f963..7fbd9302397 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libiconv -, libjpeg, zlib, openssl, libwebp, catch }: +, libjpeg, zlib, openssl, libwebp, catch2 }: stdenv.mkDerivation rec { pname = "arc_unpacker"; @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { sha256 = "1xxrc9nww0rla3yh10z6glv05ax4rynwwbd0cdvkp7gyqzrv97xp"; }; - nativeBuildInputs = [ cmake makeWrapper catch ]; + nativeBuildInputs = [ cmake makeWrapper catch2 ]; buildInputs = [ boost libpng libjpeg zlib openssl libwebp ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; postPatch = '' - cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h + cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h ''; checkPhase = '' @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # A few tests fail on aarch64 - doCheck = !stdenv.isAarch64; + # A few tests fail on aarch64-linux + doCheck = !(stdenv.isLinux && stdenv.isAarch64); meta = with lib; { description = "A tool to extract files from visual novel archives"; |