swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #237645 from wegank/arc-unpacker-boost

Browse source 
arc_unpacker: drop boost175
This commit is contained in:
Weijia Wang 2023-06-14 09:56:05 +03:00 committed by GitHub
parent c620130c93 7756269294
commit 3a1ee7d5b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkgs/tools/archivers/arc_unpacker/default.nix
View file

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

4
pkgs/top-level/all-packages.nix
View file

@ -1361,9 +1361,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 { };