Merge pull request #112775 from danieldk/maturin-pname

This commit is contained in:
Sandro 2021-02-12 19:12:25 +01:00 committed by GitHub
commit e9b66b96cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions

View File

@ -1,26 +1,29 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config { lib
, darwin }: , stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
, dbus
, Security
}:
let rustPlatform.buildRustPackage rec {
inherit (darwin.apple_sdk.frameworks) Security; pname = "maturin";
in rustPlatform.buildRustPackage rec {
name = "maturin-${version}";
version = "0.9.0"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PyO3"; owner = "PyO3";
repo = "maturin"; repo = "maturin";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; hash = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs=";
}; };
cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; cargoHash = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gmp openssl ] buildInputs = lib.optional stdenv.isLinux dbus
++ lib.optional stdenv.isDarwin Security ++ lib.optional stdenv.isDarwin Security;
++ lib.optional stdenv.isLinux dbus;
# Requires network access, fails in sandbox. # Requires network access, fails in sandbox.
doCheck = false; doCheck = false;

View File

@ -10840,7 +10840,10 @@ in
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
maturin = callPackage ../development/tools/rust/maturin { }; maturin = callPackage ../development/tools/rust/maturin {
inherit (darwin.apple_sdk.frameworks) Security;
};
inherit (rustPackages) rls; inherit (rustPackages) rls;
rustfmt = rustPackages.rustfmt; rustfmt = rustPackages.rustfmt;
rustracer = callPackage ../development/tools/rust/racer { rustracer = callPackage ../development/tools/rust/racer {