diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 653b14f6ca1e..8ee9c0f16725 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -65,7 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
     ./remove-tools-1.11.patch
     ./go_no_vendor_checks-1.23.patch
     ./go-env-go_ldso.patch
-    ./go-default-pie.patch
+    (replaceVars ./go-default-pie.patch {
+      inherit (stdenv.targetPlatform.go) GOARCH;
+    })
   ];
 
   inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index e7676644128c..60a8c24ae425 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -75,7 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
     ./remove-tools-1.11.patch
     ./go_no_vendor_checks-1.23.patch
     ./go-env-go_ldso.patch
-    ./go-default-pie.patch
+    (replaceVars ./go-default-pie.patch {
+      inherit (stdenv.targetPlatform.go) GOARCH;
+    })
   ];
 
   inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
diff --git a/pkgs/development/compilers/go/go-default-pie.patch b/pkgs/development/compilers/go/go-default-pie.patch
index d26ac8f6cd0c..bce8d8dafd3d 100644
--- a/pkgs/development/compilers/go/go-default-pie.patch
+++ b/pkgs/development/compilers/go/go-default-pie.patch
@@ -7,7 +7,7 @@ index f9706a6988..abac42d550 100644
  		return true
  	}
 -	return false
-+	return BuildModeSupported("gc", "pie", goos, goarch)
++	return goarch == "@GOARCH@" && BuildModeSupported("gc", "pie", goos, goarch)
  }
  
  // ExecutableHasDWARF reports whether the linked executable includes DWARF