public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memo: don't use ag alias 

using the alias `ag` for `silver-searcher` broke the nixpkgs tarball
with an error in eval-release.nix, see discussion in #44273.
This commit is contained in:
Uli Baum 2018-08-01 10:42:09 +02:00
parent d7c34debe2
commit 26210f556a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/memo/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, ag, tree, man, stdenv, { fetchFromGitHub, silver-searcher, tree, man, stdenv,
pandocSupport ? true, pandoc ? null pandocSupport ? true, pandoc ? null
, ... }: , ... }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
in '' in ''
mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions} mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions}
substituteInPlace memo \ substituteInPlace memo \
--replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \ --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \
--replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \
--replace "man_cmd=man" "man_cmd=${man}/bin/man" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \
--replace "pandoc_cmd=pandoc" "${pandocReplacement}" --replace "pandoc_cmd=pandoc" "${pandocReplacement}"