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.

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

Jump to bottom

sqlx-cli: fix darwin build #117443

Merged
merged 5 commits into from
Mar 25, 2021
Merged

sqlx-cli: fix darwin build #117443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2337266
sqlx-cli: fix darwin build
happysalada Mar 24, 2021
072d707
Update pkgs/development/tools/rust/sqlx-cli/default.nix
happysalada Mar 25, 2021
3deba0f
make openssl optional
happysalada Mar 25, 2021
5d90316
remove trailing whitespace
happysalada Mar 25, 2021
c187d3f
Update pkgs/development/tools/rust/sqlx-cli/default.nix
SuperSandro2000 Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/development/tools/rust/sqlx-cli/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }:

rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
Expand All @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p sqlx-cli" ];

nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ];

meta = with lib; {
description =
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11206,7 +11206,9 @@ in
jdk = oraclejdk;
};

sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { };
sqlx-cli = callPackage ../development/tools/rust/sqlx-cli {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security;
};

squeak = callPackage ../development/compilers/squeak { };

Expand Down