Skip to content

fix: pkg changes for wrappers using cargo-pgrx 0.12.6 #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2024
Merged

fix: pkg changes for wrappers using cargo-pgrx 0.12.6 #1288

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59e681c
fix: pkg changes for wrappers using cargo-pgrx 0.12.6
samrose Oct 23, 2024
a090a36
chore: cleanup
samrose Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions nix/ext/wrappers/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
, rust-bin
}:
let
rustVersion = "1.76.0";
rustVersion = "1.80.0";
cargo = rust-bin.stable.${rustVersion}.default;
in
buildPgrxExtension_0_12_6 rec {
Expand All @@ -27,23 +27,33 @@ buildPgrxExtension_0_12_6 rec {
rev = "v${version}";
hash = "sha256-CkoNMoh40zbQL4V49ZNYgv3JjoNWjODtTpHn+L8DdZA=";
};

nativeBuildInputs = [ pkg-config cargo ];
buildInputs = [ openssl ] ++ lib.optionals (stdenv.isDarwin) [
buildInputs = [ openssl postgresql ] ++ lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];

NIX_LDFLAGS = "-L${postgresql}/lib -lpq";

# Set necessary environment variables for pgrx
env = lib.optionalAttrs stdenv.isDarwin {
POSTGRES_LIB = "${postgresql}/lib";
RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup";
PGPORT = "5435";
};

OPENSSL_NO_VENDOR = 1;
#need to set this to 2 to avoid cpu starvation
CARGO_BUILD_JOBS = "2";
CARGO="${cargo}/bin/cargo";

cargoLock = {
lockFile = "${src}/Cargo.lock";
outputHashes = {
"clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=";
};
allowBuiltinFetchGit = true;
};
postPatch = "cp ${cargoLock.lockFile} Cargo.lock";

buildAndTestSubdir = "wrappers";
buildFeatures = [
"helloworld_fdw"
Expand Down
Loading