From fd490e1c9de6991974da54c0b5c9e323b2e25061 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sat, 18 Mar 2023 11:12:36 +0100
Subject: [PATCH] PHP: don't override patchPhase

The advantage is that this means the original `patchPhase` becomes
available again, so people can use `patches` in overrides.
---
 .../php/builders/granular-php/default.nix           | 13 ++-----------
 src/subsystems/php/builders/simple-php/default.nix  | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/subsystems/php/builders/granular-php/default.nix b/src/subsystems/php/builders/granular-php/default.nix
index f37619bd..b3f2cc7e 100644
--- a/src/subsystems/php/builders/granular-php/default.nix
+++ b/src/subsystems/php/builders/granular-php/default.nix
@@ -181,21 +181,12 @@
           # set name & version
           jq \
             "(.name = \"${name}\") | \
-             (.version = \"${versionString}\")" \
+             (.version = \"${versionString}\") | \
+             (.extra.patches = {})" \
              composer.json | sponge composer.json
 
           runHook postUnpack
         '';
-        patchPhase = ''
-          runHook prePatch
-
-          # fixup composer.json
-          jq \
-             "(.extra.patches = {})" \
-             composer.json | sponge composer.json
-
-          runHook postPatch
-        '';
         configurePhase = ''
           runHook preConfigure
 
diff --git a/src/subsystems/php/builders/simple-php/default.nix b/src/subsystems/php/builders/simple-php/default.nix
index 64923fdf..22be8d9b 100644
--- a/src/subsystems/php/builders/simple-php/default.nix
+++ b/src/subsystems/php/builders/simple-php/default.nix
@@ -176,21 +176,12 @@
           # set name & version
           jq \
             "(.name = \"${name}\") | \
-             (.version = \"${versionString}\")" \
+             (.version = \"${versionString}\") | \
+             (.extra.patches = {})" \
              composer.json | sponge composer.json
 
           runHook postUnpack
         '';
-        patchPhase = ''
-          runHook prePatch
-
-          # fixup composer.json
-          jq \
-             "(.extra.patches = {})" \
-             composer.json | sponge composer.json
-
-          runHook postPatch
-        '';
         configurePhase = ''
           runHook preConfigure