From a50807e1b8b02919a18d0d0d182fe7dd0201059d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 19 Aug 2018 21:39:10 +0200
Subject: [PATCH] vim_configurable: fix lua reference

---
 pkgs/applications/editors/vim/configurable.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 6 insertions(+), 6 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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37bbf0ed0c8b..99e2fb9cf977 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18836,7 +18836,6 @@ with pkgs;
   vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
     inherit (darwin) libobjc cf-private;
-    inherit lua;
     gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2;
     guiSupport = if stdenv.isDarwin then "gtk2" else "gtk3";
   });