cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

luaPlugins: cleanups

Browse source
This commit is contained in:
Sandro Jäckel 2022-12-19 08:36:19 +01:00
parent 51850fafcc
commit 2ffe90fd2e
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/lua-modules/overrides.nix
View file

@ -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,8 +398,7 @@ with prev;
patches = [
./luuid.patch
];
postConfigure = let inherit (prev.luuid) version pname; in
''
postConfigure = ''
sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|'
'';
});

13
pkgs/top-level/lua-packages.nix
View file

@ -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 = ''
@ -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;
};
}) {});
}) {};
}