diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
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
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtiger/pkg-config.patch | 37 |
1 files changed, 37 insertions, 0 deletions
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 + |