diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 32eef50a10689..7f49c31fd38c5 100644 --- 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 new file mode 100644 index 0000000000000..3d7d4103d40b7 --- /dev/null +++ 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 index 2fa63b5da8ad6..ef9194be5adce 100644 --- 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