diff options
author | Alexey Shmalko <rasen.dubi@gmail.com> | 2019-10-21 22:03:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-21 22:03:21 +0300 |
commit | 2695914175575e9ad8ae9a602a9c9668ff6e24d5 (patch) | |
tree | ef9df2de73603dc329dace2559af66cb56051b4f /pkgs/applications/window-managers | |
parent | 1125fb02ccfca1a0cf63622d090b43c7e985c9ae (diff) | |
parent | ab9fd67b68d6db6de04a6a9643f2d4b8969b23a2 (diff) |
Merge pull request #71292 from doronbehar/awesome-luajit
awesome: Make sure it compiles with luajit
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2551ea80550ef..b8f31e5b512a9 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 |