Skip to content

Commit fc0543c

Browse files
committedMay 15, 2017
cabal2nix: include nix in the generated wrapper to ensure that nix-prefetch-url is in $PATH
Fixes #25718.
1 parent 8b647e9 commit fc0543c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed
 

‎pkgs/top-level/all-packages.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,9 @@ with pkgs;
742742
exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
743743
install -D $out/bin/${drv.pname} $exe
744744
rm -rf $out/{bin,lib,share}
745-
makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin"
745+
makeWrapper $exe $out/bin/${drv.pname} \
746+
--prefix PATH ":" "${nix}/bin" \
747+
--prefix PATH ":" "${nix-prefetch-scripts}/bin"
746748
mkdir -p $out/share/bash-completion/completions
747749
$exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname}
748750
'';

0 commit comments

Comments
 (0)