diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix
index c026fb72fc40..9c95500c1917 100644
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "all" ];
 
-  prePatch = ''
+  postPatch = ''
     patchShebangs ./ # replace /bin/bash
 
     # Patch the mimetype database location which is missing on NixOS.
@@ -93,10 +93,6 @@ stdenv.mkDerivation rec {
     ./go_no_vendor_checks-1.16.patch
   ];
 
-  postPatch = ''
-    find . -name '*.orig' -exec rm {} ';'
-  '';
-
   GOOS = stdenv.targetPlatform.parsed.kernel.name;
   GOARCH = goarch stdenv.targetPlatform;
   # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix
index 03487be23c80..5248ef05826e 100644
--- a/pkgs/development/compilers/go/1.19.nix
+++ b/pkgs/development/compilers/go/1.19.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "all" ];
 
-  prePatch = ''
+  postPatch = ''
     patchShebangs ./ # replace /bin/bash
 
     # Patch the mimetype database location which is missing on NixOS.
@@ -93,10 +93,6 @@ stdenv.mkDerivation rec {
     ./go_no_vendor_checks-1.16.patch
   ];
 
-  postPatch = ''
-    find . -name '*.orig' -exec rm {} ';'
-  '';
-
   GOOS = stdenv.targetPlatform.parsed.kernel.name;
   GOARCH = goarch stdenv.targetPlatform;
   # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.