From ab9fd67b68d6db6de04a6a9643f2d4b8969b23a2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Oct 2019 19:03:19 +0300 Subject: [PATCH] awesome: Make sure it compiles with luajit --- .../applications/window-managers/awesome/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2551ea80550e..b8f31e5b512a 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -12,7 +12,10 @@ # needed for beautiful.gtk to work assert gtk3Support -> gtk3 != null; -with luaPackages; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { + lgi = luaPackages.lgi; + lua = luaPackages.lua; + ldoc = luaPackages.ldoc; pname = "awesome"; version = "4.3"; @@ -49,8 +52,11 @@ with luaPackages; stdenv.mkDerivation rec { xcbutilxrm ] ++ stdenv.lib.optional gtk3Support gtk3; - #cmakeFlags = "-DGENERATE_MANPAGES=ON"; - cmakeFlags = "-DOVERRIDE_VERSION=${version}"; + cmakeFlags = [ + #"-DGENERATE_MANPAGES=ON" + "-DOVERRIDE_VERSION=${version}" + ] ++ stdenv.lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" + ; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags