Skip to content

fix: remove darwin support for nix #1108

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

Closed
wants to merge 2 commits into from
Closed

fix: remove darwin support for nix #1108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
255df88
fix: remove darwin support for nix
pcnc Aug 11, 2024
02e4ff4
fix: cut down the size of nix store prior to release of AMI
samrose Aug 11, 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
2 changes: 1 addition & 1 deletion common-nix.vars.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
postgres-version = "15.6.1.108"
postgres-version = "15.6.1.109-rc1"
1 change: 0 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
ourSystems = with flake-utils.lib; [
system.x86_64-linux
system.aarch64-linux
system.aarch64-darwin
];
in
flake-utils.lib.eachSystem ourSystems (system:
Expand Down
12 changes: 1 addition & 11 deletions nix/ext/plv8.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
, runCommand
, coreutils
, gnugrep
, gcc
}:

stdenv.mkDerivation (finalAttrs: {
Expand All @@ -33,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: {

nativeBuildInputs = [
perl
] ++ lib.optionals stdenv.isDarwin [
gcc
];

buildInputs = [
Expand All @@ -50,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
"SHLIB_LINK=-lv8"
"V8_OUTDIR=${v8}/lib"
];
NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64)
"-undefined dynamic_lookup";

NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
"-I${v8}/include"
"-I${postgresql}/include"
];
installFlags = [
# PGXS only supports installing to postgresql prefix so we need to redirect this
"DESTDIR=${placeholder "out"}"
Expand Down Expand Up @@ -149,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
homepage = "https://plv8.github.io/";
maintainers = with maintainers; [ samrose ];
platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
license = licenses.postgresql;
#broken = postgresql.jitSupport;
};
Expand Down
Loading