diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-19 21:39:10 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-08-19 21:39:10 +0200 |
| commit | a50807e1b8b02919a18d0d0d182fe7dd0201059d (patch) | |
| tree | ded0017548516e472df94aeaf79c26d7fdc589b8 /pkgs/applications/editors/vim | |
| parent | 96b9d77dd8a9f72244ac31e28608582ffdb62c5a (diff) | |
| download | nixlib-a50807e1b8b02919a18d0d0d182fe7dd0201059d.tar nixlib-a50807e1b8b02919a18d0d0d182fe7dd0201059d.tar.gz nixlib-a50807e1b8b02919a18d0d0d182fe7dd0201059d.tar.bz2 nixlib-a50807e1b8b02919a18d0d0d182fe7dd0201059d.tar.lz nixlib-a50807e1b8b02919a18d0d0d182fe7dd0201059d.tar.xz nixlib-a50807e1b8b02919a18d0d0d182fe7dd0201059d.tar.zst nixlib-a50807e1b8b02919a18d0d0d182fe7dd0201059d.zip | |
vim_configurable: fix lua reference
Diffstat (limited to 'pkgs/applications/editors/vim')
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3711b3cdcee4..6c20ac8bd088 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby +{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext +, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -28,7 +28,8 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge # allow this to be disabled by setting config.vim.darwin to false , darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) # Enable Darwin support , ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support -, ... }: with args; +, ... +}: let @@ -100,7 +101,7 @@ in stdenv.mkDerivation rec { "--disable-gtktest" ] ++ stdenv.lib.optionals luaSupport [ - "--with-lua-prefix=${args.lua}" + "--with-lua-prefix=${lua}" "--enable-luainterp" ] ++ stdenv.lib.optionals pythonSupport [ @@ -148,7 +149,7 @@ in stdenv.mkDerivation rec { postInstall = '' '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ "$out"/bin/{vim,gvim} ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc |