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

Fix cabal2nix/stack2nix overrides

Browse Source 
Use lib.makeBinPath.
This commit is contained in:
Mateusz Kowalczyk 2017-08-02 12:58:17 +01:00 committed by Nicholas Clarke
parent 8c642d5937
commit cd24744506
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

@ -796,10 +796,10 @@ with pkgs;
enableSharedExecutables = false; enableSharedExecutables = false;
executableToolDepends = [ makeWrapper ]; executableToolDepends = [ makeWrapper ];
postInstall = '' postInstall = ''
exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} exe=$libexec/bin/${drv.pname}-${drv.version}/${drv.pname}
install -D $out/bin/${drv.pname} $exe install -D $bin/bin/${drv.pname} $exe
rm -rf $out/{bin,lib,share} rm -rf $bin/bin $out/lib $out/share
makeWrapper $exe $out/bin/${drv.pname} \ makeWrapper $exe $bin/bin/${drv.pname} \
--prefix PATH ":" "${nix}/bin" \ --prefix PATH ":" "${nix}/bin" \
--prefix PATH ":" "${nix-prefetch-scripts}/bin" --prefix PATH ":" "${nix-prefetch-scripts}/bin"
mkdir -p $out/share/bash-completion/completions mkdir -p $out/share/bash-completion/completions
@ -811,7 +811,7 @@ with pkgs;
executableToolDepends = [ makeWrapper ]; executableToolDepends = [ makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/stack2nix \ wrapProgram $out/bin/stack2nix \
--prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" ${lib.makeBinPath [ git cabal2nix cabal-install stack ]}
''; '';
}); });