Skip to content
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.

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

postgresqlPackages.timescaledb: fix darwin build #123337

Merged
merged 1 commit into from May 17, 2021

Conversation

kalekseev
Copy link
Contributor

Motivation for this change

ZHF: #122042

https://nix-cache.s3.amazonaws.com/log/s3m2v9zld8lbjhwnspp9rb00yqs06ryl-timescaledb-2.2.1.drv

ping @NixOS/nixos-release-managers

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "2.2.1";

nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
buildInputs = [ postgresql openssl libkrb5 ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
buildInputs = [ postgresql openssl libkrb5 ];
buildInputs = [ postgresql openssl ] ++ lib.optional stdenv.isDarwin libkrb5;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WFM macos 10.15, nixos x86_64

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Result of nixpkgs-review pr 123337 run on x86_64-linux 1

1 package built:
  • postgresqlPackages.timescaledb (postgresql11Packages.timescaledb)

@jonringer jonringer merged commit 73c7f50 into NixOS:master May 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants