diff options
author | Peter Simons <simons@cryp.to> | 2017-12-04 12:36:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-04 12:36:45 +0100 |
commit | 7993e8790f45f1548adaed2782e9bb83d1dd9df8 (patch) | |
tree | 2c9045d086dd6df3b0dcfe2c4753ce00cc61e3dc /pkgs/top-level | |
parent | f1e16171bd133fef971336bf3516dd819984e75e (diff) | |
parent | dc0e594451342e8058e40e6b89948417c95120ce (diff) | |
download | nixlib-7993e8790f45f1548adaed2782e9bb83d1dd9df8.tar nixlib-7993e8790f45f1548adaed2782e9bb83d1dd9df8.tar.gz nixlib-7993e8790f45f1548adaed2782e9bb83d1dd9df8.tar.bz2 nixlib-7993e8790f45f1548adaed2782e9bb83d1dd9df8.tar.lz nixlib-7993e8790f45f1548adaed2782e9bb83d1dd9df8.tar.xz nixlib-7993e8790f45f1548adaed2782e9bb83d1dd9df8.tar.zst nixlib-7993e8790f45f1548adaed2782e9bb83d1dd9df8.zip |
Merge pull request #32112 from nc6/hask-split-out
Revive multiple outputs for Haskell packages.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f549e571abe5..c478347d1700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -830,10 +830,10 @@ with pkgs; enableSharedExecutables = false; executableToolDepends = [ makeWrapper ]; postInstall = '' - 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} \ + exe=$libexec/bin/${drv.pname}-${drv.version}/${drv.pname} + install -D $bin/bin/${drv.pname} $exe + rm -rf $bin/bin $out/lib $out/share + makeWrapper $exe $bin/bin/${drv.pname} \ --prefix PATH ":" "${nix}/bin" \ --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions} @@ -847,7 +847,7 @@ with pkgs; executableToolDepends = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/stack2nix \ - --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" + ${lib.makeBinPath [ git cabal2nix cabal-install stack ]} ''; }); |