arc_unpacker: drop boost175
This commit is contained in:
parent
3f3ca021b7
commit
7756269294
2 changed files with 40 additions and 8 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -1359,9 +1359,7 @@ with pkgs;
|
|||
type = "OPN";
|
||||
};
|
||||
|
||||
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
|
||||
boost = boost175; # checkPhase fails with Boost 1.77
|
||||
};
|
||||
arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };
|
||||
|
||||
adminer = callPackage ../servers/adminer { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue