From 1e88d3fa74c683fafd9eadf4fdc251a39bbcc09f Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Mon, 27 Nov 2023 15:55:24 +0100 Subject: [PATCH] pangomm: fix build for v 2.42.2 The build of `pangomm` 2.42 is broken due to a missing include statement in `attrlist.cc` (a generated source file). Others have already run into this issue and @dslm4515 has outlined a patch in a respective issue on their BMLFS project [1]. [1]: https://github.com/dslm4515/BMLFS/issues/16#issuecomment-914624797 --- .../2.42.2-add-missing-include-attrlist.cc.patch | 12 ++++++++++++ pkgs/development/libraries/pangomm/2.42.nix | 9 +++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/pangomm/2.42.2-add-missing-include-attrlist.cc.patch diff --git a/pkgs/development/libraries/pangomm/2.42.2-add-missing-include-attrlist.cc.patch b/pkgs/development/libraries/pangomm/2.42.2-add-missing-include-attrlist.cc.patch new file mode 100644 index 000000000000..019c2dec2bc9 --- /dev/null +++ b/pkgs/development/libraries/pangomm/2.42.2-add-missing-include-attrlist.cc.patch @@ -0,0 +1,12 @@ +diff --git a/untracked/pango/pangomm/attrlist.cc b/untracked/pango/pangomm/attrlist.cc +index 76c3341..0c6d68d 100755 +--- a/untracked/pango/pangomm/attrlist.cc ++++ b/untracked/pango/pangomm/attrlist.cc +@@ -3,6 +3,7 @@ + + #include + ++#include + #include + #include + diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix index 33cc40c96840..267e46c48c3d 100644 --- a/pkgs/development/libraries/pangomm/2.42.nix +++ b/pkgs/development/libraries/pangomm/2.42.nix @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; }; + patches = [ + # Fixes a missing include leading to build failures while compiling `attrlist.cc` (as outlined by @dslm4515 [1]) + # Note that the files in that directory are generated and not tracked in Git [2], which is why we can't simply + # try to cherry-pick an upstream patch from future versions. + # [1]: https://github.com/dslm4515/BMLFS/issues/16#issuecomment-914624797 + # [2]: https://github.com/GNOME/pangomm/tree/master/untracked + ./2.42.2-add-missing-include-attrlist.cc.patch + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [