Skip to content

pgrx: use clang from nixpkgs-oldstable for old pgrx builds #2647

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

Draft
mmlb wants to merge 1 commit into
base: develop
Choose a base branch
from
+7 −12
Draft

pgrx: use clang from nixpkgs-oldstable for old pgrx builds #2647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 6 additions & 12 deletions nix/cargo-pgrx/mkPgrxExtension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
callPackage,
lib,
pkgs,
callPackage,
clang_oldstable,
rustVersion,
pgrxVersion,
makeRustPlatform,
Expand Down Expand Up @@ -40,18 +42,10 @@ let
bindgenHook =
# Fix bindgen error on aarch64-linux for versions using pgrx with bindgen 0.68.1
# This affects pgrx 0.6.1 through 0.11.2 which have issues with ARM NEON vector ABI
if (builtins.compareVersions "0.11.3" pgrxVersion > 0) then
let
nixos2211 = (
import (builtins.fetchTarball {
url = "https://channels.nixos.org/nixos-22.11/nixexprs.tar.xz";
sha256 = "1j7h75a9hwkkm97jicky5rhvzkdwxsv5v46473rl6agvq2sj97y1";
}) { inherit (stdenv.hostPlatform) system; }
);
in
if stdenv.hostPlatform.system == "aarch64-linux" && lib.versionOlder pgrxVersion "0.11.3" then
rustPlatform.bindgenHook.overrideAttrs {
libclang = nixos2211.clang.cc.lib;
clang = nixos2211.clang;
libclang = clang_oldstable.cc.lib;
clang = clang_oldstable;
}
else
rustPlatform.bindgenHook;
Expand Down
1 change: 1 addition & 0 deletions nix/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
in
_final: _prev: {
v8_oldstable = oldstable.v8;
clang_oldstable = oldstable.llvmPackages_12.clang;
}
)
];
Expand Down
Loading