From b964f4b421ff4406667ee66db177def03a3b2158 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Nov 2019 03:35:19 -0600 Subject: [PATCH] vector: make some more options override-able Unfortunately, buildRustPackage isn't very flexible right now, and most of these attrs can't be overridden. This is needed for some general patch work, but isn't really long term sustainable. I plan on reverting this after Vector 0.6 is out. Signed-off-by: Austin Seipp --- pkgs/tools/misc/vector/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 8c5ba4100c64..b5e341650303 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -6,20 +6,31 @@ (if stdenv.isAarch64 then [ "jemallocator" ] else [ "leveldb" "jemallocator" ]) + +# Unfortunately, buildRustPackage does not really support using overrideAttrs +# on the underlying fields, because it doesn't pass them to stdenv.mkDerivation +# as an attr. making it a parameter is the only way to do so. sigh + +, version ? "0.5.0" + +, srcRef ? { + rev = "refs/tags/v${version}"; + sha256 = "0niyxlvphn3awrpfh1hbqy767cckgjzyjrkqjxj844czxhh1hhff"; + } + +, cargoSha256 ? "0bdgan891hrah54g6aaysqizkxrfsbidnxihai0i7h7knzq9gsk5" +, patches ? [] }: rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.5.0"; - + inherit version cargoSha256 patches; src = fetchFromGitHub { - owner = "timberio"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0niyxlvphn3awrpfh1hbqy767cckgjzyjrkqjxj844czxhh1hhff"; + owner = "timberio"; + repo = pname; + inherit (srcRef) rev sha256; }; - cargoSha256 = "0bdgan891hrah54g6aaysqizkxrfsbidnxihai0i7h7knzq9gsk5"; buildInputs = [ openssl pkgconfig protobuf ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];