Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1125fb02ccfc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 269591417557
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 17, 2019

  1. awesome: Make sure it compiles with luajit

    @doronbehar
    doronbehar committed Oct 17, 2019
    Copy the full SHA
    ab9fd67 View commit details

Commits on Oct 21, 2019

  1. Merge pull request #71292 from doronbehar/awesome-luajit 

    awesome: Make sure it compiles with luajit
    @rasendubi
    rasendubi authored Oct 21, 2019
    Copy the full SHA
    2695914 View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/applications/window-managers/awesome/default.nix
12 changes: 9 additions & 3 deletions pkgs/applications/window-managers/awesome/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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