Merge pull request #82852 from Mic92/cross-build-rust-package

[WIP] buildRustPackage: enable strictDeps
This commit is contained in:
Jörg Thalheim
2020-03-29 14:07:07 +01:00
committed by GitHub
20 changed files with 31 additions and 69 deletions

View File

@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ makeWrapper ];
propagatedBuildInputs = with qt5; [
qt5.qtbase
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
qtsvg
qtquickcontrols2
qtgraphicaleffects
pkgconfig
git
];

View File

@@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [
pkgconfig
openssl
];
meta = with stdenv.lib; {

View File

@@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl";
buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
nativeBuildInputs = [ llvmPackages.clang ];
buildInputs = [ llvmPackages.libclang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
postInstall = ''