diff options
| author | Peter Simons <simons@cryp.to> | 2017-12-05 09:36:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 09:36:08 +0100 |
| commit | 8d8061ec20e0e41f43d9ff803f1834665ae31963 (patch) | |
| tree | 58601b4fbed9227cc7be7038b03f548113084782 /pkgs/top-level | |
| parent | e5e32822df935484f9baff019f692a0c6812f1c4 (diff) | |
| download | nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.gz nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.bz2 nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.lz nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.xz nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.tar.zst nixlib-8d8061ec20e0e41f43d9ff803f1834665ae31963.zip | |
Revert "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 8439f4237a35..7b29f4f9fc1d 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=$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} \ + 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}/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 \ - ${lib.makeBinPath [ git cabal2nix cabal-install stack ]} + --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" ''; }); |