diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
| commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
| tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/development/libraries/libndctl | |
| parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip | |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libndctl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libndctl/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix index 91a2c378c03c..6e82191e7558 100644 --- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/nixpkgs/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 = '' |