From 036b557bd9fd44073a68e722164ec89d327f3afb Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 18 May 2021 13:12:28 +0200 Subject: [PATCH] libndctl: build docs with asciidoc instead of asciidoctor Removes dependency on ruby 2.7 and isn't much slower (cherry picked from commit 786579c0b8ee5311af04feb036d04b78efd4b5b2) --- pkgs/development/libraries/libndctl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 91a2c378c03..6e82191e755 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +, asciidoc, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , json_c, kmod, which, util-linux, udev, keyutils }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = - [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt + [ autoreconfHook asciidoc pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt which ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-bash" "--without-systemd" + "--disable-asciidoctor" # depends on ruby 2.7, use asciidoc instead ]; patchPhase = ''