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: 2d445885ad79
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4ed066fd40f7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 13, 2019

  1. awesome: add optional gtk3 support 

    Add optional gtk3 support to Awesome so that the `beautiful.gtk` module can be
used.

The `beautiful.gtk` uses `lgi` to obtain Gtk via gobject-introspect:

    return require('lgi').Gtk

Since the current build does not include the typelib files needed, the above
call fails.

It turns out that both `gtk3` and `atk` (Accessibility toolkit) are needed, so
this commit adds them as optional build inputs.

Setting `gtk3Support` to `true` e.g. in an overlay will make `beautiful.gtk`
work at the cost of an increased closure size (currently 99.6M vs 223.4M).

Fixes #60538
    @stefano-m
    stefano-m committed May 13, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    648cbeb View commit details

Commits on May 14, 2019

  1. Merge pull request #61465 from stefano-m/release-19.03 

    awesome: add optional gtk3 support (port to 19.03 branch)
    @rasendubi
    rasendubi authored May 14, 2019
    Copy the full SHA
    4ed066f View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/applications/window-managers/awesome/default.nix
9 changes: 7 additions & 2 deletions pkgs/applications/window-managers/awesome/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,12 @@
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
, libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor
, gtk3Support ? false, gtk3 ? null
}:

# needed for beautiful.gtk to work
assert gtk3Support -> gtk3 != null;

with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
version = "4.3";
@@ -36,7 +40,8 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
xcbutilxrm ];
xcbutilxrm ]
++ stdenv.lib.optional gtk3Support gtk3;

#cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
@@ -48,7 +53,7 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";

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
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \