diff options
| author | John Ericson <git@JohnEricson.me> | 2018-10-30 15:25:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 15:25:03 -0400 |
| commit | 26fa9d2b5191d34fa8760b5efc8a3d25a2d34542 (patch) | |
| tree | 4e612069102119cd053f3343d8f07821a2697cc9 /pkgs/top-level | |
| parent | d48cef7d5b8516368b15b4430c473cb63549f20f (diff) | |
| parent | c34f5176f1173ac2cdaeed4512a61389d98f9d9f (diff) | |
| download | nixlib-26fa9d2b5191d34fa8760b5efc8a3d25a2d34542.tar nixlib-26fa9d2b5191d34fa8760b5efc8a3d25a2d34542.tar.gz nixlib-26fa9d2b5191d34fa8760b5efc8a3d25a2d34542.tar.bz2 nixlib-26fa9d2b5191d34fa8760b5efc8a3d25a2d34542.tar.lz nixlib-26fa9d2b5191d34fa8760b5efc8a3d25a2d34542.tar.xz nixlib-26fa9d2b5191d34fa8760b5efc8a3d25a2d34542.tar.zst nixlib-26fa9d2b5191d34fa8760b5efc8a3d25a2d34542.zip | |
Merge pull request #49477 from obsidiansystems/haskell-shell-completions
haskell-lib: Factor out shell completion scripts helper
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f7b6a3ba5ea..2a32f95b1a16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1029,10 +1029,10 @@ with pkgs; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { + cabal2nix = haskell.lib.overrideCabal (haskell.lib.addOptparseApplicativeCompletionScripts "cabal2nix" haskellPackages.cabal2nix) (drv: { isLibrary = false; enableSharedExecutables = false; - executableToolDepends = [ makeWrapper ]; + executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ]; postInstall = '' exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} install -D $out/bin/${drv.pname} $exe @@ -1040,11 +1040,7 @@ with pkgs; 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} - $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} - $exe --zsh-completion-script $exe >$out/share/zsh/vendor-completions/_${drv.pname} - $exe --fish-completion-script $exe >$out/share/fish/completions/${drv.pname}.fish - ''; + '' + (drv.postInstall or ""); }); stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: { |