mugiten/nix-custom-sqlite
0
0
Fork 0
Code Issues 9 Pull Requests Releases Activity

Fix make target arguments

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2026-05-19 22:07:51 +09:00
parent 7d91226dd2
commit f5e60feb6a
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amalgamation.nix
+1 -1
View File
@@ -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
src/sqlite-cli.nix
+6 -2
View File
@@ -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 [ ]);
src/sqlite.nix
+6 -2
View File
@@ -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 [ ]);