summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2023-02-05 14:02:27 -0500
committerGitHub <noreply@github.com>2023-02-05 14:02:27 -0500
commit887743a2734909a42e04d5b1d1f3f2f61d7011f8 (patch)
treed8e417576a243664818c061f4e2be9d8215993c3
parenta55d7e3b945d04ec9d4c98d48b23377749e54003 (diff)
parent0478ec60f2cf715200ade2fb500f7a1043311d8d (diff)
Merge pull request #214787 from alyssais/arc_unpacker-iconv
arc_unpacker: depend on libiconv unconditionally
-rw-r--r--pkgs/tools/archivers/arc_unpacker/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix
index 561567f8b154..ab018fde3d64 100644
--- a/pkgs/tools/archivers/arc_unpacker/default.nix
+++ b/pkgs/tools/archivers/arc_unpacker/default.nix
@@ -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