mrpeach: fix GCC 14 build (#371495)

NixOS · Jan 8, 2025 · 9f04431 · 9f04431
2 parents a797d90 + 84490ac
commit 9f04431
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI=";
   };
 
+  patches = [
+    # expose error function used by dependents
+    ./expose-error.patch
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     gettext

diff --git a/pkgs/applications/audio/puredata/expose-error.patch b/pkgs/applications/audio/puredata/expose-error.patch
@@ -0,0 +1,13 @@
+diff --git a/src/m_pd.h b/src/m_pd.h
+index c658fa5..a3a506c 100644
+--- a/src/m_pd.h
++++ b/src/m_pd.h
+@@ -8,6 +8,8 @@
+ extern "C" {
+ #endif
+
++extern void error(const char* fmt, ...);
++
+ #define PD_MAJOR_VERSION 0
+ #define PD_MINOR_VERSION 54
+ #define PD_BUGFIX_VERSION 1
diff --git a/pkgs/by-name/mr/mrpeach/package.nix b/pkgs/by-name/mr/mrpeach/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  patchPhase = ''
+  postPatch = ''
     for D in net osc
     do
       sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile
@@ -34,24 +34,28 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = ''
+    runHook preBuild
     for D in net osc
     do
       cd $D
       make
       cd ..
     done
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
     for D in net osc
     do
       cd $D
       make install
       cd ..
     done
+    runHook postInstall
   '';
 
-  fixupPhase = ''
+  preFixup = ''
     mv $out/lib/pd-externals/net $out
     mv $out/lib/pd-externals/osc $out
     rm -rf $out/lib