From fc0543cd88c0b94e2a3cf71e1e0f339875f4a8a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 May 2017 09:34:39 +0200 Subject: [PATCH] cabal2nix: include nix in the generated wrapper to ensure that nix-prefetch-url is in $PATH Fixes https://github.com/NixOS/nixpkgs/issues/25718. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d0dc74788..f45a0a87491 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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} '';