diff options
| author | Nicholas Clarke <nick@topos.org.uk> | 2017-10-12 19:39:41 +0100 |
|---|---|---|
| committer | Nicholas Clarke <nick@topos.org.uk> | 2017-11-27 16:05:22 +0000 |
| commit | d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331 (patch) | |
| tree | bf470fb62b16304abc3c10f37507ae529d3e77b3 /pkgs/top-level | |
| parent | 946ae87414a5c1039a2652814077db35c61f2074 (diff) | |
| download | nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.gz nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.bz2 nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.lz nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.xz nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.tar.zst nixlib-d90165c7db3f4b9bc93fb89d1fc3bde1ec4be331.zip | |
Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
This reverts commit 89f5d52cf44baec14a7f542a605243777b16e7a5.
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 09cc24316d25..a8ead963345b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -828,10 +828,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} @@ -845,7 +845,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 ]} ''; }); |