summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/window-managers/awesome
diff options
context:
space:
mode:
authorJoerg Thalheim <joerg@thalheim.io>2017-11-28 18:35:35 +0000
committerJoerg Thalheim <joerg@thalheim.io>2017-11-28 18:37:19 +0000
commit574edcd6b22f204fa2a08a2c8b9b27aab02b0c89 (patch)
tree289c15398cb0c06e19b7e4dc89ff0d8855f55037 /pkgs/applications/window-managers/awesome
parentfac570a71d9c842295902df0d772267a0f78a4f2 (diff)
awesome: fix LUA_PATH/LUA_CPATH to lgi
Otherwise it would not start.
Diffstat (limited to 'pkgs/applications/window-managers/awesome')
-rw-r--r--pkgs/applications/window-managers/awesome/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index ec73150a5069..4043c05e3d6d 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -10,7 +10,7 @@
with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
version = "4.2";
-
+
src = fetchFromGitHub {
owner = "awesomewm";
repo = "awesome";
@@ -25,10 +25,10 @@ with luaPackages; stdenv.mkDerivation rec {
imagemagick
makeWrapper
pkgconfig
- xmlto docbook_xml_dtd_45
+ xmlto docbook_xml_dtd_45
docbook_xsl findXMLCatalogs
];
-
+
propagatedUserEnvPkgs = [ hicolor_icon_theme ];
buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection
git lgi libpthreadstubs libstartup_notification
@@ -49,8 +49,8 @@ with luaPackages; stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/awesome \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --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_CPATH ";" '${lgi}/lib/lua/${lua.luaversion}/?.so' \
+ --prefix LUA_PATH ";" '${lgi}/share/lua/${lua.luaversion}/?.lua' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"