File tree Expand file tree Collapse file tree 7 files changed +4
-23
lines changed Expand file tree Collapse file tree 7 files changed +4
-23
lines changed Original file line number Diff line number Diff line change 11{
22 lib ,
3- apple-sdk_11 ,
43 fetchCrate ,
54 openssl ,
65 pkg-config ,
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" ;
Original file line number Diff line number Diff line change 66 fetchFromGitHub ,
77 postgresql ,
88 rust-bin ,
9- darwin ,
109} :
1110let
1211 pname = "pg_jsonschema" ;
4544 nativeBuildInputs = [ cargo ] ;
4645 buildInputs = [
4746 postgresql
48- ]
49- ++ lib . optionals stdenv . isDarwin [ darwin . apple_sdk . frameworks . SystemConfiguration ] ;
47+ ] ;
5048 # update the following array when the pg_jsonschema version is updated
5149 # required to ensure that extensions update scripts from previous versions are generated
5250
Original file line number Diff line number Diff line change 99 # to nixpkgs
1010 clang ,
1111 xcbuild ,
12- apple-sdk_11 ,
1312 patchelf ,
1413} :
1514let
@@ -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
Original file line number Diff line number Diff line change 1010 # to nixpkgs
1111 clang ,
1212 xcbuild ,
13- darwin ,
1413 patchelf ,
1514 buildEnv ,
1615 nodejs_20 ,
8079 buildInputs = [
8180 ( if ( builtins . compareVersions "3.1.10" version >= 0 ) then v8 else nodejs_20 . libv8 )
8281 postgresql
83- ]
84- ++ lib . optionals stdenv . isDarwin [
85- darwin . apple_sdk . frameworks . CoreFoundation
86- darwin . apple_sdk . frameworks . Kerberos
8782 ] ;
8883
8984 buildFlags = [ "all" ] ;
108103 "-lpq"
109104 "-lpgcommon"
110105 "-lpgport"
111- "-F${ darwin . apple_sdk . frameworks . CoreFoundation } /Library/Frameworks"
112106 "-framework"
113107 "CoreFoundation"
114- "-F${ darwin . apple_sdk . frameworks . Kerberos } /Library/Frameworks"
115108 "-framework"
116109 "Kerberos"
117110 "-undefined"
Original file line number Diff line number Diff line change 77 pkg-config ,
88 postgresql ,
99 buildEnv ,
10- apple-sdk_11 ,
1110 rust-bin ,
1211 git ,
1312} :
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
Original file line number Diff line number Diff line change 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 ;
Original file line number Diff line number Diff 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 '' ;
You can’t perform that action at this time.
0 commit comments