Merge pull request #214787 from alyssais/arc_unpacker-iconv

arc_unpacker: depend on libiconv unconditionally
This commit is contained in:
John Ericson 2023-02-05 14:02:27 -05:00 committed by GitHub
commit 887743a273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake makeWrapper catch2 ];
buildInputs = [ boost libpng libjpeg zlib openssl libwebp ]
++ lib.optionals stdenv.isDarwin [ libiconv ];
buildInputs = [ boost libiconv libjpeg libpng libwebp openssl zlib ];
postPatch = ''
cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h