ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71292 from doronbehar/awesome-luajit

Browse Source 
awesome: Make sure it compiles with luajit
This commit is contained in:
Alexey Shmalko 2019-10-21 22:03:21 +03:00 committed by GitHub
commit 2695914175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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