From fe8a3be365e40f9441d21cba56608a62b4998ea1 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Tue, 17 Nov 2020 14:26:30 +0700
Subject: [PATCH 1/4] nix: add pkgs.nixStatic

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb66cdde0eed..0ac9ec72e128 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29338,6 +29338,8 @@ in
     nixUnstable
     nixFlakes;
 
+  nixStatic = pkgsStatic.nix;
+
   nixops = callPackage ../tools/package-management/nixops { };
 
   nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { });

From 6b774d4ff60e50428b38661184eed7904d4204ca Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Tue, 23 Mar 2021 12:18:09 +0700
Subject: [PATCH 2/4] curl: fix static build

---
 pkgs/top-level/static.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index b3fe7bf8c94f..5147f45e741e 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -107,6 +107,11 @@ in {
     # --disable-shared flag
     stdenv = super.stdenv;
   };
+  curl = super.curl.override {
+    brotliSupport = false;
+    # disable gss becuase of: undefined reference to `k5_bcmp'
+    gssSupport = false;
+  };
   perl = super.perl.override {
     # Don’t use new stdenv zlib because
     # it doesn’t like the --disable-shared flag

From 2f41b6e43c7aa4bad654ec4f2c7d6696c36bafe7 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Tue, 23 Mar 2021 12:19:50 +0700
Subject: [PATCH 3/4] pkgsStatic: refactor to alphanumerical order

---
 pkgs/top-level/static.nix | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 5147f45e741e..dcbaf7e0548f 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -93,32 +93,36 @@ in {
   clangStdenv = foldl (flip id) super.clangStdenv staticAdapters;
   libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters;
 
-  zlib = super.zlib.override {
-    # Don’t use new stdenv zlib because
-    # it doesn’t like the --disable-shared flag
-    stdenv = super.stdenv;
-  };
-  openssl = super.openssl_1_1.overrideAttrs (o: {
-    # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
-    configureFlags = (removeUnknownConfigureFlags o.configureFlags);
-  });
   boost = super.boost.override {
     # Don’t use new stdenv for boost because it doesn’t like the
     # --disable-shared flag
     stdenv = super.stdenv;
   };
+
   curl = super.curl.override {
     brotliSupport = false;
     # disable gss becuase of: undefined reference to `k5_bcmp'
     gssSupport = false;
   };
+
+  ocaml-ng = self.lib.mapAttrs (_: set:
+    if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set
+  ) super.ocaml-ng;
+
+  openssl = super.openssl_1_1.overrideAttrs (o: {
+    # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
+    configureFlags = (removeUnknownConfigureFlags o.configureFlags);
+  });
+
   perl = super.perl.override {
     # Don’t use new stdenv zlib because
     # it doesn’t like the --disable-shared flag
     stdenv = super.stdenv;
   };
 
-  ocaml-ng = self.lib.mapAttrs (_: set:
-    if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set
-  ) super.ocaml-ng;
+  zlib = super.zlib.override {
+    # Don’t use new stdenv zlib because
+    # it doesn’t like the --disable-shared flag
+    stdenv = super.stdenv;
+  };
 }

From 241f38b76e4210d3584d495396afc95defeb5202 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Mon, 29 Mar 2021 19:40:05 +0700
Subject: [PATCH 4/4] pkgsStatic: comment on brotli disabled

---
 pkgs/top-level/static.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index dcbaf7e0548f..3cddcde603d8 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -100,6 +100,7 @@ in {
   };
 
   curl = super.curl.override {
+    # brotli doesn't build static (Mar. 2021)
     brotliSupport = false;
     # disable gss becuase of: undefined reference to `k5_bcmp'
     gssSupport = false;