Merge pull request #231545 from figsoda/tremor

tremor-rs: fix build, unpin openssl
This commit is contained in:
Nick Cao
2023-05-13 13:43:15 +08:00
committed by GitHub
2 changed files with 8 additions and 1 deletions
+8
View File
@@ -38,6 +38,14 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ];
# relax lints to fix an error caused by invalid macro_export
# error: `log_error` isn't a valid `#[macro_export]` argument
# note: `#[deny(invalid_macro_export_arguments)]` implied by `#[deny(warnings)]`
postPatch = ''
substituteInPlace src/lib.rs \
--replace '#![deny(' '#![warn('
'';
# TODO export TREMOR_PATH($out/lib) variable
postInstall = ''
# Copy the standard library to $out/lib
-1
View File
@@ -13661,7 +13661,6 @@ with pkgs;
tremor-rs = callPackage ../tools/misc/tremor-rs {
inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
};
tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { };