Merge remote-tracking branch 'origin/master' into hardened-stdenv

1 files changed, 8 insertions, 4 deletions

diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 3bd44fb07b7e..ea486dd5154f 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -22,9 +22,13 @@ in
       mkdir -p "$out/etc/bash_completion.d"
       cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d"
 
-      # FIXME: What's the right place for `autojump.zsh'?
-      # This can be used as a workaround in .zshrc:
-      # . $HOME/.nix-profile/share/autojump/autojump.zsh
+      cat <<SCRIPT > $out/bin/autojump-share
+      #!/bin/sh
+      # Run this script to find the autojump shared folder where all the shell
+      # integration scripts are living.
+      echo $out/share/autojump
+      SCRIPT
+      chmod +x $out/bin/autojump-share
     '';
 
     meta = {
@@ -52,6 +56,6 @@ in
       homepage = http://wiki.github.com/joelthelion/autojump;
       license = stdenv.lib.licenses.gpl3;
       platforms = stdenv.lib.platforms.all;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = [ stdenv.lib.maintainers.domenkozar ];
     };
   }