From 725585cfcaa4cbfc11fb03a3c7ba24dbe48e2886 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 27 Apr 2019 13:54:07 -0500 Subject: [PATCH] awesome: generate docs, put in separate output Especially useful when using non-release versions, but good to have locally regardless. --- pkgs/applications/window-managers/awesome/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index fa86257a1a95..51026f18120c 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -5,6 +5,7 @@ , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs , libxkbcommon, xcbutilxrm, hicolor-icon-theme , asciidoctor +, fontsConf }: with luaPackages; stdenv.mkDerivation rec { @@ -27,8 +28,13 @@ with luaPackages; stdenv.mkDerivation rec { xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor + ldoc ]; + outputs = [ "out" "doc" ]; + + FONTCONFIG_FILE = toString fontsConf; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection git lgi libpthreadstubs libstartup_notification diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67aefc86dce9..0c2c0fec50e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16634,6 +16634,7 @@ in awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; + inherit (texFunctions) fontsConf; }; awesome = awesome-4-0;