summary refs log tree commit diff
diff options
context:
space:
mode:
authorAtemu <atemu.main@gmail.com>2021-05-18 13:12:28 +0200
committerAtemu <atemu.main@gmail.com>2021-05-19 16:14:19 +0200
commit786579c0b8ee5311af04feb036d04b78efd4b5b2 (patch)
treea8ef17c7e2e83f8ce3a71e8f2b4505c070ba20f7
parentc227fb4b17469864298087f8c9367e4cfc8dd6b9 (diff)
downloadnixpkgs-786579c0b8ee5311af04feb036d04b78efd4b5b2.tar
nixpkgs-786579c0b8ee5311af04feb036d04b78efd4b5b2.tar.gz
nixpkgs-786579c0b8ee5311af04feb036d04b78efd4b5b2.tar.bz2
nixpkgs-786579c0b8ee5311af04feb036d04b78efd4b5b2.tar.lz
nixpkgs-786579c0b8ee5311af04feb036d04b78efd4b5b2.tar.xz
nixpkgs-786579c0b8ee5311af04feb036d04b78efd4b5b2.tar.zst
nixpkgs-786579c0b8ee5311af04feb036d04b78efd4b5b2.zip
libndctl: build docs with asciidoc instead of asciidoctor
Removes dependency on ruby 2.7 and isn't much slower
-rw-r--r--pkgs/development/libraries/libndctl/default.nix5
1 files 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 = ''