From 2ffe90fd2eae51482e837480f8009a0a2fb2c9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 19 Dec 2022 08:36:19 +0100
Subject: [PATCH] luaPlugins: cleanups

---
 pkgs/development/lua-modules/overrides.nix |  9 ++++-----
 pkgs/top-level/lua-packages.nix            | 15 +++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index fe6e304d9f31..fbab2d259ac1 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -376,7 +376,7 @@ with prev;
     ];
   });
 
-  lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: rec {
+  lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: {
     doCheck = false;
   });
 
@@ -398,10 +398,9 @@ with prev;
     patches = [
       ./luuid.patch
     ];
-    postConfigure = let inherit (prev.luuid) version pname; in
-      ''
-        sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|'
-      '';
+    postConfigure =  ''
+      sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|'
+    '';
   });
 
 
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 261f92c498ca..73a4efae15b7 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -59,19 +59,19 @@ in
   # a fork of luarocks used to generate nix lua derivations from rockspecs
   luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { };
 
-  luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage {
+  luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage rec {
     pname = "luxio";
     version = "13";
 
     src = fetchurl {
-      url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2";
+      url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-${version}.tar.bz2";
       sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz";
     };
 
     nativeBuildInputs = [ which pkg-config ];
 
     postPatch = ''
-      patchShebangs .
+      patchShebangs const-proc.lua
     '';
 
     preBuild = ''
@@ -80,7 +80,7 @@ in
         INST_LUADIR="$out/share/lua/${lua.luaversion}"
         LUA_BINDIR="$out/bin"
         INSTALL=install
-        );
+      );
     '';
 
     meta = with lib; {
@@ -91,14 +91,14 @@ in
       maintainers = with maintainers; [ richardipsum ];
       platforms = platforms.unix;
     };
-  });
+  }) {};
 
   nfd = callPackage ../development/lua-modules/nfd {
     inherit (pkgs.gnome) zenity;
     inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
   };
 
-  vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {
+  vicious = callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {
     pname = "vicious";
     version = "2.5.1";
 
@@ -124,6 +124,5 @@ in
       maintainers = with maintainers; [ makefu mic92 McSinyx ];
       platforms = platforms.linux;
     };
-  }) {});
-
+  }) {};
 }