arc_unpacker: 2019-01-28 -> 2021-05-17, add darwin build (#123393)
Co-authored-by: midchildan <git@midchildan.org> Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
parent
f55c3e2f21
commit
7cb8324a91
|
@ -1,22 +0,0 @@
|
||||||
From 29c0b393283395c69ecdd747e960301e95c93bcf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Rath <felixm.rath@gmail.com>
|
|
||||||
Date: Sat, 15 May 2021 13:07:38 +0200
|
|
||||||
Subject: [PATCH] add missing <stdexcept> import
|
|
||||||
|
|
||||||
`std::logic_error` is used in this file, which resides in `<stdexcept>`, but was not imported before. This caused the build to fail, see, e.g., https://hydra.nixos.org/build/141997371/log.
|
|
||||||
---
|
|
||||||
src/algo/crypt/lcg.cc | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/algo/crypt/lcg.cc b/src/algo/crypt/lcg.cc
|
|
||||||
index 6c2a7945..66630a08 100644
|
|
||||||
--- a/src/algo/crypt/lcg.cc
|
|
||||||
+++ b/src/algo/crypt/lcg.cc
|
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
|
|
||||||
#include "algo/crypt/lcg.h"
|
|
||||||
#include <functional>
|
|
||||||
+#include <stdexcept>
|
|
||||||
|
|
||||||
using namespace au;
|
|
||||||
using namespace au::algo::crypt;
|
|
|
@ -1,9 +1,9 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib
|
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libiconv
|
||||||
, openssl, libwebp, catch }:
|
, libjpeg, zlib, openssl, libwebp, catch }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "arc_unpacker-unstable";
|
pname = "arc_unpacker";
|
||||||
version = "2019-01-28";
|
version = "unstable-2021-05-17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vn-tools";
|
owner = "vn-tools";
|
||||||
|
@ -11,19 +11,13 @@ stdenv.mkDerivation rec {
|
||||||
# Since the latest release (0.11) doesn't build, we've opened an upstream
|
# Since the latest release (0.11) doesn't build, we've opened an upstream
|
||||||
# issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a
|
# issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a
|
||||||
# a new release is upcoming
|
# a new release is upcoming
|
||||||
rev = "b9843a13e2b67a618020fc12918aa8d7697ddfd5";
|
rev = "9c2781fcf3ead7641e873b65899f6abeeabb2fc8";
|
||||||
sha256 = "0wpl30569cip3im40p3n22s11x0172a3axnzwmax62aqlf8kdy14";
|
sha256 = "1xxrc9nww0rla3yh10z6glv05ax4rynwwbd0cdvkp7gyqzrv97xp";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake makeWrapper catch ];
|
nativeBuildInputs = [ cmake makeWrapper catch ];
|
||||||
buildInputs = [ boost libpng libjpeg zlib openssl libwebp ];
|
buildInputs = [ boost libpng libjpeg zlib openssl libwebp ]
|
||||||
|
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||||
patches = [
|
|
||||||
# Add a missing `<stdexcept>` import that caused the build to fail.
|
|
||||||
# Failure: https://hydra.nixos.org/build/141997371/log
|
|
||||||
# Also submitted as an upstream PR: https://github.com/vn-tools/arc_unpacker/pull/194
|
|
||||||
./add-missing-import.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h
|
cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h
|
||||||
|
@ -51,12 +45,14 @@ stdenv.mkDerivation rec {
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
# A few tests fail on aarch64
|
||||||
|
doCheck = !stdenv.isAarch64;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A tool to extract files from visual novel archives";
|
description = "A tool to extract files from visual novel archives";
|
||||||
homepage = "https://github.com/vn-tools/arc_unpacker";
|
homepage = "https://github.com/vn-tools/arc_unpacker";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ midchildan ];
|
maintainers = with maintainers; [ midchildan ];
|
||||||
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue