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

Fix use of core-ext passthru flags

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2026-05-19 22:44:02 +09:00
parent 42f8332a4b
commit 2ddd7b1418
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sqlite-cli.nix
+2 -2
View File
@@ -59,12 +59,12 @@ stdenv.mkDerivation (finalAttrs: {
];
makeFlags =
(coreInitExt.passthru.makeFlags or [ ])
(if coreInitExt == null then [ ] else coreInitExt.passthru.extraMakeFlags)
++ 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 [ ]);
env.NIX_LDFLAGS = lib.concatStringsSep " " (if coreInitExt == null then [ ] else coreInitExt.passthru.extraLDFLAGS);
})
src/sqlite.nix
+2 -3
View File
@@ -55,19 +55,18 @@ stdenv.mkDerivation (finalAttrs: {
"--${if static then "disable" else "enable"}-shared"
"--${if static then "enable" else "disable"}-static"
"--${if amalgamate then "enable" else "disable"}-amalgamation"
] ++ lib.optional features.ENABLE_ICU [
"--enable-icu-collations"
"--with-icu-config=${lib.getExe' icu.dev "icu-config"}"
];
makeFlags =
(coreInitExt.passthru.makeFlags or [ ])
(if coreInitExt == null then [ ] else coreInitExt.passthru.extraMakeFlags)
++ 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 [ ]);
env.NIX_LDFLAGS = lib.concatStringsSep " " (if coreInitExt == null then [ ] else coreInitExt.passthru.extraLDFLAGS);
})