diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
| commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
| tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/applications/window-managers/awesome | |
| parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
| parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
| download | nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip | |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/applications/window-managers/awesome')
| -rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 449ec9989fa6..d4721c992008 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -3,11 +3,11 @@ , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen -#, xmlto, docbook_xml_dtd_45 , docbook_xsl +, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs }: let - version = "3.5.8"; + version = "3.5.9"; in with luaPackages; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "1iifcyphgibmh3cvsy8agjrl9zjl80scrg0bcgnwywmxaxncjc3w"; + sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; }; meta = with stdenv.lib; { @@ -26,25 +26,29 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; - buildInputs = [ + nativeBuildInputs = [ asciidoc - cairo cmake - dbus doxygen + imagemagick + makeWrapper + pkgconfig + xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + ]; + + buildInputs = [ + cairo + dbus gdk_pixbuf gobjectIntrospection git - imagemagick lgi libpthreadstubs libstartup_notification libxdg_basedir lua - makeWrapper nettools pango - pkgconfig xcb-util-cursor xorg.libXau xorg.libXdmcp @@ -55,7 +59,6 @@ stdenv.mkDerivation rec { xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm - #xmlto docbook_xml_dtd_45 docbook_xsl ]; #cmakeFlags = "-DGENERATE_MANPAGES=ON"; |