public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awesome: fix LUA_PATH/LUA_CPATH to lgi

Browse Source 
Otherwise it would not start.
This commit is contained in:
Joerg Thalheim 2017-11-28 18:35:35 +00:00
parent fac570a71d
commit 574edcd6b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/window-managers/awesome/default.nix
View File

@ -10,7 +10,7 @@
with luaPackages; stdenv.mkDerivation rec { with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}"; name = "awesome-${version}";
version = "4.2"; version = "4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awesomewm"; owner = "awesomewm";
repo = "awesome"; repo = "awesome";
@ -25,10 +25,10 @@ with luaPackages; stdenv.mkDerivation rec {
imagemagick imagemagick
makeWrapper makeWrapper
pkgconfig pkgconfig
xmlto docbook_xml_dtd_45 xmlto docbook_xml_dtd_45
docbook_xsl findXMLCatalogs docbook_xsl findXMLCatalogs
]; ];
propagatedUserEnvPkgs = [ hicolor_icon_theme ]; propagatedUserEnvPkgs = [ hicolor_icon_theme ];
buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection
git lgi libpthreadstubs libstartup_notification git lgi libpthreadstubs libstartup_notification
@ -49,8 +49,8 @@ with luaPackages; stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/awesome \ wrapProgram $out/bin/awesome \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ --prefix LUA_CPATH ";" '${lgi}/lib/lua/${lua.luaversion}/?.so' \
--prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix LUA_PATH ";" '${lgi}/share/lua/${lua.luaversion}/?.lua' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"