From 204ea0bfb7e4dcf41c91a6d14e58d42fe08ef9c3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 May 2020 04:20:00 -0500 Subject: [PATCH] zoxide: make fzf optional --- pkgs/tools/misc/zoxide/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index ab8633c4990..ee15786d40c 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -1,7 +1,7 @@ -{ lib +{ stdenv , fetchFromGitHub , rustPlatform -, fzf +, withFzf ? true, fzf }: rustPlatform.buildRustPackage rec { @@ -15,13 +15,14 @@ rustPlatform.buildRustPackage rec { sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6"; }; - buildInputs = [ - fzf - ]; + postPatch = stdenv.lib.optionalString withFzf '' + substituteInPlace src/fzf.rs \ + --replace '"fzf"' '"${fzf}/bin/fzf"' + ''; cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd"; - meta = with lib; { + meta = with stdenv.lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ];