flattenInclude: a useful utility, moved into glib now

1 files changed, 18 insertions, 2 deletions

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 93493a3abda..20b5ce52bc7 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -11,6 +11,19 @@
 #     Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
 #       $out/bin/gtester-report' to postInstall if this is solved
 
+let
+  # some packages don't get "Cflags" from pkgconfig correctly
+  # and then fail to build when directly including like <glib/...>
+  flattenInclude = ''
+    for dir in $out/include/*; do
+      cp -r $dir/* "$out/include/"
+      rm -r "$dir"
+      ln -s . "$dir"
+    done
+    ln -sr -t "$out/include/" $out/lib/*/include/* 2>/dev/null || true
+  '';
+in
+
 stdenv.mkDerivation (rec {
   name = "glib-2.36.0";
 
@@ -30,10 +43,13 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
-  passthru.gioModuleDir = "lib/gio/modules";
-
   postInstall = ''rm -rvf $out/share/gtk-doc'';
 
+  passthru = {
+     gioModuleDir = "lib/gio/modules";
+     inherit flattenInclude;
+  };
+
   meta = {
     description = "GLib, a C library of programming buildings blocks";