Skip to content

Commit 761b267

Browse files
committed
fixup! fixup! fixup! fixup! fixup! Nix: Prebuilt sqlite
1 parent 3854f80 commit 761b267

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

‎libs/opsqueue_python/opsqueue_python.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ let
3232
sources = import ../../nix/sources.nix;
3333
crane = import sources.crane { pkgs = pkgs; };
3434
craneLib = crane.overrideToolchain (pkgs: rustToolchain);
35+
sqlitePkgConfigPath = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ pkgs.sqlite ];
3536

3637
# Only the files necessary to build the Rust-side and cache dependencies
3738
sqlFileFilter = path: _type: builtins.match "^.*\.(db|sql)$" path != null;
@@ -82,6 +83,7 @@ let
8283
inherit cargoArtifacts;
8384
src = wheelSrc;
8485
env.LIBSQLITE3_SYS_USE_PKG_CONFIG = "${pkgs.sqlite.dev}";
86+
env.PKG_CONFIG_PATH = sqlitePkgConfigPath;
8587
}
8688
)).overrideAttrs
8789
(old: {

‎opsqueue/opsqueue.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ let
1616
sources = import ../nix/sources.nix;
1717
crane = import sources.crane { pkgs = pkgs; };
1818
craneLib = crane.overrideToolchain (pkgs: rustToolchain);
19+
sqlitePkgConfigPath = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ pkgs.sqlite ];
1920

2021
# Only the files necessary to build the Rust-side and cache dependencies
2122
sqlFileFilter = path: _type: builtins.match "^.*\.(db|sql)$" path != null;
@@ -55,6 +56,7 @@ craneLib.buildPackage (
5556
env = {
5657
DATABASE_URL = "sqlite:///build/opsqueue/opsqueue/opsqueue_example_database_schema.db";
5758
LIBSQLITE3_SYS_USE_PKG_CONFIG = "${pkgs.sqlite.dev}";
59+
PKG_CONFIG_PATH = sqlitePkgConfigPath;
5860
};
5961

6062
}

0 commit comments

Comments
 (0)