From f5e60feb6afa22aced5a4082cb84b1cc8bbb40f0 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 19 May 2026 22:07:51 +0900 Subject: [PATCH] Fix make target arguments --- src/amalgamation.nix | 2 +- src/sqlite-cli.nix | 8 ++++++-- src/sqlite.nix | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/amalgamation.nix b/src/amalgamation.nix index b07cdfa..ee0417b 100644 --- a/src/amalgamation.nix +++ b/src/amalgamation.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " featureFlags; env.NIX_CFLAGS_LINK = lib.optionalString features.ENABLE_FTS5 "-lm"; - makeTarget = "sqlite3.c"; + makeFlags = [ "sqlite3.c" "sqlite3.h" ]; installPhase = '' runHook preInstall diff --git a/src/sqlite-cli.nix b/src/sqlite-cli.nix index 0f4e6ba..845a417 100644 --- a/src/sqlite-cli.nix +++ b/src/sqlite-cli.nix @@ -58,8 +58,12 @@ stdenv.mkDerivation (finalAttrs: { "--with-icu-config=${lib.getExe' icu.dev "icu-config"}" ]; - makeTarget = "sqlite3"; - makeFlags = (coreInitExt.passthru.makeFlags or [ ]) ++ map (opt: "OPTIONS+=${lib.escapeShellArg opt}") featureFlags; + makeFlags = + (coreInitExt.passthru.makeFlags or [ ]) + ++ map (opt: "OPTIONS+=${lib.escapeShellArg opt}") featureFlags + ++ [ + "sqlite3" + ]; env.NIX_CFLAGS_LINK = lib.optionalString features.ENABLE_FTS5 "-lm"; env.NIX_LDFLAGS = lib.concatStringsSep " " (coreInitExt.passthru.extraLDFLAGS or [ ]); diff --git a/src/sqlite.nix b/src/sqlite.nix index 4e7738a..b6d1685 100644 --- a/src/sqlite.nix +++ b/src/sqlite.nix @@ -61,8 +61,12 @@ stdenv.mkDerivation (finalAttrs: { "--with-icu-config=${lib.getExe' icu.dev "icu-config"}" ]; - makeTarget = if static then "lib" else "so"; - makeFlags = (coreInitExt.passthru.makeFlags or [ ]) ++ map (opt: "OPTIONS+=${lib.escapeShellArg opt}") featureFlags; + makeFlags = + (coreInitExt.passthru.makeFlags or [ ]) + ++ map (opt: "OPTIONS+=${lib.escapeShellArg opt}") featureFlags + ++ [ + (if static then "lib" else "so") + ]; env.NIX_CFLAGS_LINK = lib.optionalString features.ENABLE_FTS5 "-lm"; env.NIX_LDFLAGS = lib.concatStringsSep " " (coreInitExt.passthru.extraLDFLAGS or [ ]);