summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2015-08-28 19:27:33 -0700
committerBenjamin Staffin <benley@gmail.com>2015-08-28 19:27:33 -0700
commit5fe9618a30e4bca97f5b76cb094084122e1dd9ed (patch)
treedb2546ba86405c982fdf04ff801b2c6a80075895 /pkgs/misc
parentd2dce19793069b6104ff7df29af92316e7fe3b50 (diff)
downloadnixlib-5fe9618a30e4bca97f5b76cb094084122e1dd9ed.tar
nixlib-5fe9618a30e4bca97f5b76cb094084122e1dd9ed.tar.gz
nixlib-5fe9618a30e4bca97f5b76cb094084122e1dd9ed.tar.bz2
nixlib-5fe9618a30e4bca97f5b76cb094084122e1dd9ed.tar.lz
nixlib-5fe9618a30e4bca97f5b76cb094084122e1dd9ed.tar.xz
nixlib-5fe9618a30e4bca97f5b76cb094084122e1dd9ed.tar.zst
nixlib-5fe9618a30e4bca97f5b76cb094084122e1dd9ed.zip
vimUtils.pluginnames2nix: fixes for non-nixos systems
Now referring to the nix prefetch scripts through their nixpkgs
derivation in order to make sure their shebang lines are rewritten
properly.  Otherwise nix-prefetch-hg fails on Ubuntu (and probably
Debian) systems, where /bin/sh is not bash.
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/vim-plugins/vim-utils.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index ec1724a9f9a1..c75a92f46cfb 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -1,6 +1,7 @@
-{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin}:
+{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin
+, nix-prefetch-scripts }:
 
-/* 
+/*
 
 USAGE EXAMPLE
 =============
@@ -309,8 +310,8 @@ rec {
         echom repeat("=", 80)
       endif
       let opts = {}
-      let opts.nix_prefetch_git = "${../../../pkgs/build-support/fetchgit/nix-prefetch-git}"
-      let opts.nix_prefetch_hg  = "${../../../pkgs/build-support/fetchhg/nix-prefetch-hg}"
+      let opts.nix_prefetch_git = "${nix-prefetch-scripts}/bin/nix-prefetch-git"
+      let opts.nix_prefetch_hg  = "${nix-prefetch-scripts}/bin/nix-prefetch-hg"
       let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache'
       let opts.plugin_dictionaries = []
       ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles }