Skip to content

Commit

Permalink
cabal2nix: include nix in the generated wrapper to ensure that nix-pr…
Browse files Browse the repository at this point in the history
…efetch-url is in $PATH

Fixes #25718.
  • Loading branch information
peti committed May 15, 2017
1 parent 8b647e9 commit fc0543c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -742,7 +742,9 @@ with pkgs;
exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
install -D $out/bin/${drv.pname} $exe
rm -rf $out/{bin,lib,share}
makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin"
makeWrapper $exe $out/bin/${drv.pname} \
--prefix PATH ":" "${nix}/bin" \
--prefix PATH ":" "${nix-prefetch-scripts}/bin"
mkdir -p $out/share/bash-completion/completions
$exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname}
'';
Expand Down

0 comments on commit fc0543c

Please sign in to comment.