summary refs log tree commit diff
path: root/doc/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-07-28 13:44:21 +0000
committerAlyssa Ross <hi@alyssa.is>2021-07-28 17:46:39 +0000
commitcab13e087c80c4e7476bb7df432e2b7deb56563d (patch)
treef8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /doc/default.nix
parentd9c82ed3044c72cecf01c6ea042489d30914577c (diff)
parent8ecc61c91a596df7d3293603a9c2384190c1b89a (diff)
downloadnixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst
nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts:
	pkgs/applications/graphics/hello-wayland/default.nix
	pkgs/applications/virtualization/cloud-hypervisor/default.nix
	pkgs/applications/window-managers/tinywl/default.nix
	pkgs/applications/window-managers/wayfire/applications.nix
	pkgs/applications/window-managers/wayfire/default.nix
	pkgs/applications/window-managers/wayfire/wcm.nix
	pkgs/applications/window-managers/wayfire/wf-config.nix
	pkgs/applications/window-managers/wayfire/wf-shell.nix
	pkgs/development/libraries/wlroots/default.nix
	pkgs/os-specific/linux/chromium-os/crosvm/default.nix
	pkgs/os-specific/linux/kernel/common-config.nix
	pkgs/os-specific/linux/kernel/patches.nix
	pkgs/os-specific/linux/mdevd/default.nix
	pkgs/os-specific/linux/s6-linux-init/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'doc/default.nix')
-rw-r--r--doc/default.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/default.nix b/doc/default.nix
index d9051167dee..ac382ec8519 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -5,9 +5,17 @@ let
 in pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
-  buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing  xmlformat ];
+  nativeBuildInputs = with pkgs; [
+    pandoc
+    graphviz
+    libxml2
+    libxslt
+    zip
+    jing
+    xmlformat
+  ];
 
-  src = ./.;
+  src = lib.cleanSource ./.;
 
   postPatch = ''
     ln -s ${doc-support} ./doc-support/result
@@ -25,4 +33,7 @@ in pkgs.stdenv.mkDerivation {
     echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
     echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products
   '';
+
+  # Environment variables
+  PANDOC_LUA_FILTERS_DIR = "${pkgs.pandoc-lua-filters}/share/pandoc/filters";
 }