diff options
Diffstat (limited to 'pkgs/tools/archivers/arc_unpacker')
| -rw-r--r-- | pkgs/tools/archivers/arc_unpacker/add-missing-import.patch | 22 | ||||
| -rw-r--r-- | pkgs/tools/archivers/arc_unpacker/default.nix | 17 |
2 files changed, 38 insertions, 1 deletions
diff --git a/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch b/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch new file mode 100644 index 000000000000..d0ed0bb5b830 --- /dev/null +++ b/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch @@ -0,0 +1,22 @@ +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; diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index dcd5243d7135..c6259cf11b0f 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -18,22 +18,37 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper catch ]; buildInputs = [ boost libpng libjpeg zlib openssl libwebp ]; + 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 = '' cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h ''; checkPhase = '' + runHook preCheck + pushd .. ./build/run_tests popd + + runHook postCheck ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker cp -r ../etc $out/libexec/arc_unpacker makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker + + runHook postInstall ''; doCheck = true; @@ -41,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to extract files from visual novel archives"; homepage = "https://github.com/vn-tools/arc_unpacker"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ midchildan ]; }; } |