From a1dc7fcf171c2a84df4a656c1e5e23bb01fd94b9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 12:57:38 +0000 Subject: [PATCH] pkg-config: depend on libiconv unconditionally libiconv is already defined per-platform. The actual libiconv library won't be built on platforms like Linux where it doesn't need to be, so there's no need to maintain a separate platform list here. Fixes pkgsCross.x86_64-freebsd.pkg-config. --- pkgs/development/tools/misc/pkg-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index f2721ab952c6..360e50aef187 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rm -f check/check-requires-private check/check-gtk check/missing ''; - buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; + buildInputs = [ libiconv ]; configureFlags = [ "--with-internal-glib" ] ++ optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]