Merge pull request #130382 from DeeUnderscore/rq-drop-v8

rq: drop v8 input
This commit is contained in:
Pavol Rusnak 2021-07-16 20:23:24 +02:00 committed by GitHub
commit 143a07745e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }:
{ stdenv, lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "rq";
@ -13,9 +13,6 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0071q08f75qrxdkbx1b9phqpbj15r79jbh391y32acifi7hr35hj";
buildInputs = [ llvmPackages.libclang v8 ]
++ lib.optionals stdenv.isDarwin [ libiconv ];
postPatch = ''
# Remove #[deny(warnings)] which is equivalent to -Werror in C.
# Prevents build failures when upgrading rustc, which may give more warnings.
@ -23,11 +20,6 @@ rustPlatform.buildRustPackage rec {
--replace "#![deny(warnings)]" ""
'';
configurePhase = ''
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
export V8_SOURCE="${v8}"
'';
meta = with lib; {
description = "A tool for doing record analysis and transformation";
homepage = "https://github.com/dflemstr/rq";

View File

@ -8489,9 +8489,7 @@ in
routino = callPackage ../tools/misc/routino { };
rq = callPackage ../development/tools/rq {
inherit (darwin) libiconv;
};
rq = callPackage ../development/tools/rq { };
rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { };