Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

2 files changed, 49 insertions, 2 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libtiger/default.nix b/nixpkgs/pkgs/development/libraries/libtiger/default.nix
index 60dee56e6a2a..7876c23bcc1d 100644
--- a/nixpkgs/pkgs/development/libraries/libtiger/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libtiger/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }:
+{ stdenv, lib, fetchurl, autoreconfHook, pkg-config
+, libkate, pango, cairo, darwin
+}:
 
 stdenv.mkDerivation rec {
   pname = "libtiger";
@@ -9,7 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  patches = [
+    ./pkg-config.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace configure.ac --replace "-Werror" "-Wno-error"
+  '';
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libkate pango cairo ]
     ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices;
 
diff --git a/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch b/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch
new file mode 100644
index 000000000000..68c892544615
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch
@@ -0,0 +1,37 @@
+From 3ebeb0932edc01b7768216dc7d3b3c5aac21fba0 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Sun, 26 Feb 2023 17:21:48 +0000
+Subject: [PATCH] configure.ac: detect pkg-config properly
+
+When cross compiling, the relevant pkg-config program might be prefixed
+with the name of the host platform, so the previous check was not
+correct.  Detect pkg-config properly, using the appropriate macro.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f63684..bf2faf7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,7 @@ AC_CHECK_FUNCS([select nanosleep usleep])
+ 
+ AC_TYPE_SIZE_T
+ 
+-AC_CHECK_PROG(HAVE_PKG_CONFIG,pkg-config,yes)
++PKG_PROG_PKG_CONFIG
+ 
+ AC_ARG_ENABLE(doc, [  --disable-doc           Disable building documentation (default enabled)])
+ if test "x$enable_doc" != "xno"
+@@ -57,7 +57,7 @@ else
+ fi
+ AM_CONDITIONAL(HAVE_DOXYGEN,test "${HAVE_DOXYGEN}" = "yes")
+ 
+-if test "x$HAVE_PKG_CONFIG" = "xyes"
++if test "x$PKG_CONFIG" != "x"
+ then
+   PKG_CHECK_MODULES(KATE,kate >= 0.2.0)
+   PKG_CHECK_MODULES(PANGOCAIRO,pangocairo >= 1.16)
+-- 
+2.37.1
+