Skip to content

Commit ffda9b1

Browse files
committed
fix(darwin): remove reference to apple-sdk
1 parent 29c79bf commit ffda9b1

File tree

7 files changed

+4
-21
lines changed

7 files changed

+4
-21
lines changed

nix/cargo-pgrx/default.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
lib,
3-
apple-sdk_11,
43
fetchCrate,
54
openssl,
65
pkg-config,
@@ -34,9 +33,7 @@ let
3433
src = fetchCrate { inherit version pname hash; };
3534
inherit cargoHash;
3635
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
37-
buildInputs =
38-
lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
39-
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
36+
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
4037

4138
OPENSSL_DIR = "${openssl.dev}";
4239
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";

nix/ext/pg_jsonschema/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ let
4545
nativeBuildInputs = [ cargo ];
4646
buildInputs = [
4747
postgresql
48-
]
49-
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
48+
];
5049
# update the following array when the pg_jsonschema version is updated
5150
# required to ensure that extensions update scripts from previous versions are generated
5251

nix/ext/plv8.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# to nixpkgs
1010
clang,
1111
xcbuild,
12-
apple-sdk_11,
1312
patchelf,
1413
}:
1514
let
@@ -48,8 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
4847
buildInputs = [
4948
v8
5049
postgresql
51-
]
52-
++ lib.optionals stdenv.isDarwin [ apple-sdk_11 ];
50+
];
5351

5452
buildFlags = [ "all" ];
5553

nix/ext/plv8/default.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ let
8080
buildInputs = [
8181
(if (builtins.compareVersions "3.1.10" version >= 0) then v8 else nodejs_20.libv8)
8282
postgresql
83-
]
84-
++ lib.optionals stdenv.isDarwin [
85-
darwin.apple_sdk.frameworks.CoreFoundation
86-
darwin.apple_sdk.frameworks.Kerberos
8783
];
8884

8985
buildFlags = [ "all" ];
@@ -108,10 +104,8 @@ let
108104
"-lpq"
109105
"-lpgcommon"
110106
"-lpgport"
111-
"-F${darwin.apple_sdk.frameworks.CoreFoundation}/Library/Frameworks"
112107
"-framework"
113108
"CoreFoundation"
114-
"-F${darwin.apple_sdk.frameworks.Kerberos}/Library/Frameworks"
115109
"-framework"
116110
"Kerberos"
117111
"-undefined"

nix/ext/wrappers/default.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
pkg-config,
88
postgresql,
99
buildEnv,
10-
apple-sdk_11,
1110
rust-bin,
1211
git,
1312
}:
@@ -40,8 +39,7 @@ let
4039
buildInputs = [
4140
openssl
4241
postgresql
43-
]
44-
++ lib.optionals stdenv.isDarwin [ apple-sdk_11 ];
42+
];
4543

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

nix/overlays/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
cargo-pgrx = final.callPackage ../cargo-pgrx/default.nix {
2121
inherit (final) lib;
22-
inherit (final) apple-sdk_11;
2322
inherit (final) fetchCrate;
2423
inherit (final) openssl;
2524
inherit (final) pkg-config;

nix/packages/packer.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ buildGoModule rec {
3232

3333
nativeBuildInputs = [ installShellFiles ];
3434

35-
buildInputs = lib.optionals pkgs.stdenv.isDarwin [ pkgs.apple-sdk_11 ];
36-
3735
postInstall = ''
3836
installShellCompletion --zsh contrib/zsh-completion/_packer
3937
'';

0 commit comments

Comments
 (0)