From 79e207786d8af1fb9e13c20341ed2672eac95235 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 18 May 2026 19:17:06 +0900
Subject: [PATCH] Strip unnecessary build config for amalgamation

---
 src/amalgamation.nix | 44 +++++++++++++-------------------------------
 src/mk-sqlite.nix    |  6 ++----
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/src/amalgamation.nix b/src/amalgamation.nix
index f1ef417..98ab913 100644
--- a/src/amalgamation.nix
+++ b/src/amalgamation.nix
@@ -6,29 +6,27 @@
   nameSuffix,
 
   stdenv,
-  featureFlags ? [ ],
-  extensions ? [ ],
-  enableInteractive ? false,
 
   unzip,
   zlib,
   readline,
   ncurses,
+
+  features,
+  featureFlags,
+  enableInteractive ? false,
+
+  ...
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlite-amalgamation${nameSuffix}";
   inherit version src;
 
-  outputs = [
-    # "bin"
-    "dev"
-    "out"
-  ];
-
   nativeBuildInputs = [
     unzip
   ];
+
   buildInputs = [
     zlib
   ]
@@ -47,27 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
   # on a per-output basis.
   setOutputFlags = false;
 
-  configureFlags = [
-    # "--bindir=${placeholder "bin"}/bin"
-    "--includedir=${placeholder "dev"}/include"
-    "--libdir=${placeholder "out"}/lib"
-  ]
-  ++ lib.optional (!enableInteractive) "--disable-readline"
-  # autosetup only looks up readline.h in predefined set of directories.
-  ++ lib.optional enableInteractive "--with-readline-header=${lib.getDev readline}/include/readline/readline.h"
-  ++ lib.optional (stdenv.hostPlatform.isStatic) "--disable-shared";
+  configureFlags =
+    lib.optional (!enableInteractive) "--disable-readline"
+    # autosetup only looks up readline.h in predefined set of directories.
+    ++ lib.optional enableInteractive "--with-readline-header=${lib.getDev readline}/include/readline/readline.h";
 
-  env.NIX_CFLAGS_COMPILE = toString featureFlags;
-
-  # Test for features which may not be available at compile time
-  preBuild = ''
-    # Necessary for FTS5 on Linux
-    export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lm"
-
-    echo ""
-    echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
-    echo ""
-  '';
+  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " featureFlags;
+  env.NIX_CFLAGS_LINK = lib.optionalString features.ENABLE_FTS5 "-lm";
 
   makeTarget = "sqlite3.c";
 
@@ -78,6 +62,4 @@ stdenv.mkDerivation (finalAttrs: {
 
     runHook postInstall
   '';
-
-  # dontInstall = true;
 })
diff --git a/src/mk-sqlite.nix b/src/mk-sqlite.nix
index 238a307..c56e8ee 100644
--- a/src/mk-sqlite.nix
+++ b/src/mk-sqlite.nix
@@ -60,10 +60,8 @@ in {
   # "sqlite"
   # "sqlite-static"
 } // lib.optionalAttrs amalgamate {
-  amalgamation = pkgs.callPackage ./amalgamation.nix {
+  amalgamation = pkgs.callPackage ./amalgamation.nix ({
     inherit (pkgs.sqlite) version src;
     nameSuffix = suffix;
-    inherit enableInteractive;
-    inherit (config) featureFlags;
-  };
+  } // config);
 }