dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #61161 from stefano-m/awesome-issue-60538

Browse Source 
awesome: add optional gtk3 support
This commit is contained in:
Alexey Shmalko 2019-05-12 00:37:19 +03:00 committed by GitHub
commit dedda379bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,12 @@
, libxkbcommon, xcbutilxrm, hicolor-icon-theme , libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor , asciidoctor
, fontsConf , fontsConf
, gtk3Support ? false, gtk3 ? null
}: }:
# needed for beautiful.gtk to work
assert gtk3Support -> gtk3 != null;
with luaPackages; stdenv.mkDerivation rec { with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}"; name = "awesome-${version}";
version = "4.3"; version = "4.3";
@ -42,7 +46,8 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
xcbutilxrm ]; xcbutilxrm ]
++ stdenv.lib.optional gtk3Support gtk3;
#cmakeFlags = "-DGENERATE_MANPAGES=ON"; #cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}"; cmakeFlags = "-DOVERRIDE_VERSION=${version}";
@ -54,7 +59,7 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
postInstall = '' postInstall = ''
# Don't use wrapProgram or or the wrapper will duplicate the --search # Don't use wrapProgram or the wrapper will duplicate the --search
# arguments every restart # arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped" mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \ makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \