Merge pull request #194461 from jstranik/master

build2: fix build with gcc11
2022-10-06 07:43:09 +01:00
parent 86ddb19076 7ac1f68ce2
commit c12e310faa
2 changed files with 13 additions and 0 deletions
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
    ./remove-config-store-paths.patch
    # Pick up sysdirs from NIX_LDFLAGS
    ./nix-ldflags-sysdirs.patch
+
+    ./remove-const-void-param.patch
  ];

  strictDeps = true;
@@ -0,0 +1,11 @@
+--- build2-0.14.0_/libbuild2/cc/pkgconfig.cxx	2022-10-04 14:18:24.864604892 -0400
+++ build2-0.14.0/libbuild2/cc/pkgconfig.cxx	2022-10-04 14:20:58.153254961 -0400
+@@ -186,7 +186,7 @@
+     ;
+
+   static bool
+-  pkgconf_error_handler (const char* msg, const pkgconf_client_t*, const void*)
+  pkgconf_error_handler (const char* msg, const pkgconf_client_t*, void*)
+   {
+     error << runtime_error (msg); // Sanitize the message.
+     return true;