diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-08-31 07:06:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 07:06:57 +0100 |
| commit | 95d9a6c0aa296280261d4adde64e6c42ad9ccc4f (patch) | |
| tree | 2dce525bfeedacb96e18fa69fc78f3e496b3efee /pkgs/shells | |
| parent | a2de9c334a5901f57ae41aa134d9fbd83b802fb8 (diff) | |
| parent | 6d988e5e568d0804083d1faff2e367348d9a1072 (diff) | |
| download | nixlib-95d9a6c0aa296280261d4adde64e6c42ad9ccc4f.tar nixlib-95d9a6c0aa296280261d4adde64e6c42ad9ccc4f.tar.gz nixlib-95d9a6c0aa296280261d4adde64e6c42ad9ccc4f.tar.bz2 nixlib-95d9a6c0aa296280261d4adde64e6c42ad9ccc4f.tar.lz nixlib-95d9a6c0aa296280261d4adde64e6c42ad9ccc4f.tar.xz nixlib-95d9a6c0aa296280261d4adde64e6c42ad9ccc4f.tar.zst nixlib-95d9a6c0aa296280261d4adde64e6c42ad9ccc4f.zip | |
Merge pull request #28779 from vyp/deer
deer: init at 1.4
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh-deer/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/shells/zsh-deer/realpath.patch | 28 |
2 files changed, 63 insertions, 0 deletions
diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh-deer/default.nix new file mode 100644 index 000000000000..3fa941c08c39 --- /dev/null +++ b/pkgs/shells/zsh-deer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, perl }: + +let + version = "1.4"; + name = "deer-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchFromGitHub { + owner = "Vifon"; + repo = "deer"; + rev = "v${version}"; + sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl"; + }; + + prePatch = '' + substituteInPlace deer \ + --replace " perl " " ${perl}/bin/perl " + ''; + + patches = [ ./realpath.patch ]; + + installPhase = '' + mkdir -p $out/share/zsh/site-functions/ + cp deer $out/share/zsh/site-functions/ + ''; + + meta = with stdenv.lib; { + description = "Ranger-like file navigation for zsh"; + homepage = "https://github.com/Vifon/deer"; + license = licenses.gpl3Plus; + maintainers = maintainers.vyp; + platforms = platforms.unix; + }; +} diff --git a/pkgs/shells/zsh-deer/realpath.patch b/pkgs/shells/zsh-deer/realpath.patch new file mode 100644 index 000000000000..03850d7e5c12 --- /dev/null +++ b/pkgs/shells/zsh-deer/realpath.patch @@ -0,0 +1,28 @@ +From ceadb2f11119143af4f590ea6b05a531483219b5 Mon Sep 17 00:00:00 2001 +From: xd1le <elisp.vim@gmail.com> +Date: Wed, 30 Aug 2017 17:27:20 +1000 +Subject: [PATCH] use realpath instead of python to calculate relative path + +--- + deer | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/deer b/deer +index 3d89dea..804a871 100644 +--- a/deer ++++ b/deer +@@ -259,10 +259,7 @@ deer-get-relative() + { + local TMP + TMP=${1:-${DEER_DIRNAME%/}/$DEER_BASENAME[$DEER_DIRNAME]} +- TMP="`python -c ' +-import sys, os +-print(os.path.relpath(sys.argv[1], sys.argv[2])) +-' $TMP ${DEER_STARTDIR:-$PWD}`" ++ TMP="`realpath --relative-to=${DEER_STARTDIR:-$PWD} $TMP`" + print -R $TMP:q + } + +-- +2.14.1 + |