Some lua and awesome improvements
- Move lgi to luaPackages - Use luaPackages in awesome and passthru lua - Allow to pass lua modules to the awesome WM so that those can be used in the configuration
This commit is contained in:
@@ -5,8 +5,9 @@
|
||||
for each package in a separate file: the call to the function would
|
||||
be almost as must code as the function itself. */
|
||||
|
||||
{ fetchurl, stdenv, lua, callPackage, unzip, zziplib
|
||||
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
|
||||
{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
|
||||
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
|
||||
, perl, gtk, python, glib, gobjectIntrospection
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -14,6 +15,7 @@ let
|
||||
isLua52 = lua.luaversion == "5.2";
|
||||
self = _self;
|
||||
_self = with self; {
|
||||
inherit lua;
|
||||
inherit (stdenv.lib) maintainers;
|
||||
|
||||
#define build lua package function
|
||||
@@ -255,4 +257,31 @@ let
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
lgi = stdenv.mkDerivation rec {
|
||||
name = "lgi-${version}";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pavouk/lgi/archive/${version}.tar.gz";
|
||||
sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GObject-introspection based dynamic Lua binding to GObject based libraries";
|
||||
homepage = https://github.com/pavouk/lgi;
|
||||
license = "custom";
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
buildInputs = [ glib gobjectIntrospection lua pkgconfig ];
|
||||
|
||||
makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];
|
||||
|
||||
preBuild = ''
|
||||
sed -i "s|/usr/local|$out|" lgi/Makefile
|
||||
'';
|
||||
};
|
||||
|
||||
}; in self
|
||||
|
||||
Reference in New Issue
Block a user