diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-14 01:13:00 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-14 01:13:00 +0300 |
| commit | 7756269294910b60d85a0a093b12e68271e0db0e (patch) | |
| tree | ee718f6c6b4b7d875a5d2c0c7b3d40e6c3fc346c /pkgs/tools/archivers | |
| parent | 3f3ca021b78b23715c0f1e88ba4bd6d7edca95d3 (diff) | |
arc_unpacker: drop boost175
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/arc_unpacker/default.nix | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 2ade0f88a8d0d..ee40a7a5ab4ac 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libiconv -, libjpeg, zlib, openssl, libwebp, catch2 }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, makeWrapper +, boost +, libpng +, libiconv +, libjpeg +, zlib +, openssl +, libwebp +, catch2 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arc_unpacker"; version = "unstable-2021-08-06"; @@ -12,14 +25,35 @@ stdenv.mkDerivation rec { hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8="; }; - nativeBuildInputs = [ cmake makeWrapper catch2 ]; - buildInputs = [ boost libiconv libjpeg libpng libwebp openssl zlib ]; + patches = [ + (fetchpatch { + name = "failing_tests.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/failing_tests.patch?h=arc_unpacker-git&id=bda1ad9f69e6802e703b2e6913d71a36d76cfef9"; + hash = "sha256-bClACsf/+SktyLAPtt7EcSqprkw8JVIi1ZLpcJcv9IE="; + }) + ]; postPatch = '' cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12 ''; + nativeBuildInputs = [ + cmake + makeWrapper + catch2 + ]; + + buildInputs = [ + boost + libiconv + libjpeg + libpng + libwebp + openssl + zlib + ]; + checkPhase = '' runHook preCheck |