From 6c5776d523aca9ab86697402177342df06bc0e37 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 15 Aug 2024 20:08:13 +0200
Subject: Fix many more OpenSSLs.

---
 flake.nix | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index d1d8944..93deff9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,17 +59,23 @@
           if version == null then
             (pkgs.openssl.override { static = true; })
           else
-            (pkgs.openssl.override { static = true; }).overrideAttrs (
-              final: prev: rec {
-                inherit version;
-                src = pkgs.fetchurl {
-                  url = "https://www.openssl.org/source/openssl-${version}.tar.gz";
-                  inherit hash;
-                };
-                # FIXME Removing patches might cause unwanted things; this should be version based!
-                patches = [ ];
-              }
-            );
+            (pkgs.openssl.override {
+              static = true;
+              enableKTLS = false;
+            }).overrideAttrs
+              (
+                final: prev: rec {
+                  inherit version;
+                  src = pkgs.fetchurl {
+                    url = "https://www.openssl.org/source/openssl-${version}.tar.gz";
+                    inherit hash;
+                  };
+                  # FIXME Removing patches might cause unwanted things; this should be version based!
+                  patches = [ ];
+
+                  configureFlags = if pkgs.lib.versionOlder version "1.1.2" then (pkgs.lib.lists.remove "no-module" prev.configureFlags) else prev.configureFlags;
+                  }
+              );
         botan2Builder =
           {
             version ? null,
@@ -176,17 +182,17 @@
                 patches =
                   {
                     "v2.25.0" = pkgs.fetchpatch {
-                    	url = "https://github.com/Mbed-TLS/mbedtls/pull/4237/commits/29b641688d038143a193c69eac4d6e8eacc934d8.patch";
-                    	hash = "sha256-i8Kn+QVCeJbrm0z6d60FbzCZ5t0oP2EhdYw8w3nV8b8=";
+                      url = "https://github.com/Mbed-TLS/mbedtls/pull/4237/commits/29b641688d038143a193c69eac4d6e8eacc934d8.patch";
+                      hash = "sha256-i8Kn+QVCeJbrm0z6d60FbzCZ5t0oP2EhdYw8w3nV8b8=";
                     };
                     "v2.26.0" = [
                       (pkgs.fetchpatch {
-                    	url = "https://github.com/Mbed-TLS/mbedtls/pull/4237/commits/2065a8d8af27c6cb1e40c9462b5933336dca7434.patch";
-                    	hash = "sha256-gLMiozagnzARt6jRhklUYqZgdvrKySBXTkuQ2Xm3lJs=";
+                        url = "https://github.com/Mbed-TLS/mbedtls/pull/4237/commits/2065a8d8af27c6cb1e40c9462b5933336dca7434.patch";
+                        hash = "sha256-gLMiozagnzARt6jRhklUYqZgdvrKySBXTkuQ2Xm3lJs=";
                       })
-					  (pkgs.fetchpatch {
-                    	url = "https://github.com/Mbed-TLS/mbedtls/pull/4237/commits/29b641688d038143a193c69eac4d6e8eacc934d8.patch";
-                    	hash = "sha256-i8Kn+QVCeJbrm0z6d60FbzCZ5t0oP2EhdYw8w3nV8b8=";
+                      (pkgs.fetchpatch {
+                        url = "https://github.com/Mbed-TLS/mbedtls/pull/4237/commits/29b641688d038143a193c69eac4d6e8eacc934d8.patch";
+                        hash = "sha256-i8Kn+QVCeJbrm0z6d60FbzCZ5t0oP2EhdYw8w3nV8b8=";
                       })
                     ];
                     "v3.2.0" = (
-- 
cgit v1.2.3-70-g09d2