colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #146843 from arkivm/darwin-fixes-arc_unpacker

Browse Source 
arc_unpacker: Move to catch2 to support aarch64-darwin
This commit is contained in:
Domen Kožar 2021-11-22 08:50:48 +01:00 committed by GitHub
commit 43a7d62e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/archivers/arc_unpacker/default.nix
View File

@ -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";