about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-12-01 19:00:09 +0100
committerAlyssa Ross <hi@alyssa.is>2023-12-01 19:00:09 +0100
commit9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch)
tree4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/pangomm/2.42.nix
parenta9cbfb6941b47d6f50129e6e36927882392daed7 (diff)
parent2344fe1da14cb08b0c18743b207995f9b8597915 (diff)
downloadnixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pangomm/2.42.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/pangomm/2.42.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix b/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix
index 33cc40c96840..267e46c48c3d 100644
--- a/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix
+++ b/nixpkgs/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 [