Skip to content

Commit 255df88

Browse files
committed
fix: remove darwin support for nix
1 parent 7b5aab5 commit 255df88

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

common-nix.vars.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.6.1.108"
1+
postgres-version = "15.6.1.109-rc1"

flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
ourSystems = with flake-utils.lib; [
1616
system.x86_64-linux
1717
system.aarch64-linux
18-
system.aarch64-darwin
1918
];
2019
in
2120
flake-utils.lib.eachSystem ourSystems (system:

nix/ext/plv8.nix

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
, runCommand
99
, coreutils
1010
, gnugrep
11-
, gcc
1211
}:
1312

1413
stdenv.mkDerivation (finalAttrs: {
@@ -33,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
3332

3433
nativeBuildInputs = [
3534
perl
36-
] ++ lib.optionals stdenv.isDarwin [
37-
gcc
3835
];
3936

4037
buildInputs = [
@@ -50,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
5047
"SHLIB_LINK=-lv8"
5148
"V8_OUTDIR=${v8}/lib"
5249
];
53-
NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64)
54-
"-undefined dynamic_lookup";
55-
56-
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
57-
"-I${v8}/include"
58-
"-I${postgresql}/include"
59-
];
6050
installFlags = [
6151
# PGXS only supports installing to postgresql prefix so we need to redirect this
6252
"DESTDIR=${placeholder "out"}"
@@ -149,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
149139
description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
150140
homepage = "https://plv8.github.io/";
151141
maintainers = with maintainers; [ samrose ];
152-
platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
142+
platforms = [ "x86_64-linux" "aarch64-linux" ];
153143
license = licenses.postgresql;
154144
#broken = postgresql.jitSupport;
155145
};

0 commit comments

Comments
 (0)