cargo-msrv: move to pkgs/by-name
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
+1
-10
@@ -6,8 +6,6 @@
|
||||
rustup,
|
||||
openssl,
|
||||
stdenv,
|
||||
libiconv,
|
||||
Security,
|
||||
makeWrapper,
|
||||
gitUpdater,
|
||||
}:
|
||||
@@ -35,14 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# Integration tests fail
|
||||
doCheck = false;
|
||||
|
||||
buildInputs =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
[
|
||||
libiconv
|
||||
Security
|
||||
]
|
||||
else
|
||||
[ openssl ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -6820,9 +6820,6 @@ with pkgs;
|
||||
zig = buildPackages.zig_0_12;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-ndk = callPackage ../development/tools/rust/cargo-ndk {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user