Skip to content

Commit 14d711f

Browse files
committed
build(nix): reverting the workspace.
1 parent ee0395d commit 14d711f

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

nix/ext/kilobase.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ buildPgrxExtension_0_15_0 rec {
1818
hash = "sha256-VVH9GyKgKgkvi3iI8SffScPl00cIDlvPZbVJLgrzX1o=";
1919
};
2020

21-
# Build from the kilobase subdirectory
22-
cargoRoot = "apps/kbve/kilobase";
21+
# Build from workspace root (with Rust 1.85 we support edition 2024)
22+
cargoRoot = ".";
2323

24-
# No need for --package flag when in the package directory
25-
cargoBuildFlags = [ ];
24+
# Build only kilobase package
25+
cargoBuildFlags = [ "--package" "kilobase" ];
2626

2727
nativeBuildInputs = [ ];
2828
buildInputs = [ postgresql ];
@@ -54,13 +54,11 @@ buildPgrxExtension_0_15_0 rec {
5454
# Disable tests for now
5555
doCheck = false;
5656

57-
# Disable cargo-auditable to avoid issues with edition 2024
57+
# Disable cargo-auditable to avoid issues
5858
auditable = false;
5959

60-
# Copy Cargo.lock to the subdirectory where cargo expects it
61-
postPatch = ''
62-
cp ${src}/Cargo.lock apps/kbve/kilobase/
63-
'';
60+
# Tell cargo pgrx package which package to build
61+
buildAndTestSubdir = "apps/kbve/kilobase";
6462

6563
meta = with lib; {
6664
description = "Kilobase PostgreSQL extension";

0 commit comments

Comments
 (0)