From d1a1a0a1b1d779fb075097f6a7e38a6bbb54074d Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 14:59:07 +0200
Subject: [PATCH 1/4] boringssl: add updateScript

---
 pkgs/by-name/bo/boringssl/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 9efc590eaaa2..54c2c9507013 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -6,6 +6,7 @@
   ninja,
   perl,
   buildGoModule,
+  gitUpdater,
 }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
@@ -81,6 +82,8 @@ buildGoModule (finalAttrs: {
     "dev"
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     description = "Free TLS/SSL implementation";
     mainProgram = "bssl";

From 100a688336398a0e59c08655942b7d1c218f95bf Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 15:16:14 +0200
Subject: [PATCH 2/4] boringssl: fix license

BoringSSL has been relicensed to Apache 2.0 as of February 2025
---
 pkgs/by-name/bo/boringssl/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 54c2c9507013..ec0d2186b3c4 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -90,7 +90,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://boringssl.googlesource.com";
     maintainers = [ lib.maintainers.thoughtpolice ];
     license = with lib.licenses; [
-      openssl
+      asl20
       isc
       mit
       bsd3

From c95158747779baf6c2cfcb596de37c63fe20f8dc Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 15:17:50 +0200
Subject: [PATCH 3/4] boringssl: refactor build

Co-Authored-By: Theo Paris <theo@tinted.dev>
---
 pkgs/by-name/bo/boringssl/package.nix | 38 +--------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index ec0d2186b3c4..71f09d807713 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -5,12 +5,11 @@
   cmake,
   ninja,
   perl,
-  buildGoModule,
   gitUpdater,
 }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
-buildGoModule (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "boringssl";
   version = "0.20251002.0";
 
@@ -31,18 +30,6 @@ buildGoModule (finalAttrs: {
     perl
   ];
 
-  vendorHash = "sha256-IXmnoCYLoiQ/XL2wjksRFv5Kwsje0VNkcupgGxG6rSY=";
-  proxyVendor = true;
-
-  # hack to get both go and cmake configure phase
-  # (if we use postConfigure then cmake will loop runHook postConfigure)
-  preBuild = ''
-    cmakeConfigurePhase
-  ''
-  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-    export GOARCH=$(go env GOHOSTARCH)
-  '';
-
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isGNU [
       # Needed with GCC 12 but breaks on darwin (with clang)
@@ -53,29 +40,6 @@ buildGoModule (finalAttrs: {
     ]
   );
 
-  buildPhase = ''
-    ninjaBuildPhase
-  '';
-
-  # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux.
-  cmakeFlags = [
-    "-GNinja"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $bin/bin $dev $out/lib
-
-    install -Dm755 bssl -t $bin/bin
-    install -Dm644 {libcrypto,libdecrepit,libpki,libssl}.a -t $out/lib
-
-    cp -r ../include $dev
-
-    runHook postInstall
-  '';
-
   outputs = [
     "out"
     "bin"

From 905b80d01a8a97b10c9bbd8098803b915e4b0d40 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 17:39:46 +0200
Subject: [PATCH 4/4] boringssl: add maintainers theoparis and niklaskorz

---
 pkgs/by-name/bo/boringssl/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 71f09d807713..ea8695903891 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -52,7 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Free TLS/SSL implementation";
     mainProgram = "bssl";
     homepage = "https://boringssl.googlesource.com";
-    maintainers = [ lib.maintainers.thoughtpolice ];
+    maintainers = with lib.maintainers; [
+      thoughtpolice
+      theoparis
+      niklaskorz
+    ];
     license = with lib.licenses; [
       asl20
       isc