diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-01-31 16:21:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-31 16:21:51 +0100 |
commit | b9af749fffd47cf9b6c78ff8d774a640b27c1394 (patch) | |
tree | fb8c839ccbdbc274f7fabe63afa36e4c93901272 | |
parent | 52418a5183eb450bfc8894d5a8ff803caa2f233a (diff) | |
parent | 184637940b32ed628bcdbe45a8a0b17bec57dedd (diff) |
Merge pull request #285280 from adamcstephens/lxc/docbook-fix
lxc: fix aarch64 build failure
-rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lxc/docbook-hack.patch | 21 |
2 files changed, 28 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 4caf5b9aa943d..518d79b622a62 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -45,7 +45,13 @@ stdenv.mkDerivation rec { systemd ]; - patches = [ ./add-meson-options.patch ]; + patches = [ + # make build more nix compatible + ./add-meson-options.patch + + # fix docbook2man version detection + ./docbook-hack.patch + ]; mesonFlags = [ "-Dinstall-init-files=false" diff --git a/pkgs/os-specific/linux/lxc/docbook-hack.patch b/pkgs/os-specific/linux/lxc/docbook-hack.patch new file mode 100644 index 0000000000000..f758014efbaa2 --- /dev/null +++ b/pkgs/os-specific/linux/lxc/docbook-hack.patch @@ -0,0 +1,21 @@ +diff --git a/meson.build b/meson.build +index d1527679e..360824994 100644 +--- a/meson.build ++++ b/meson.build +@@ -320,15 +320,7 @@ docconf.set('LXC_USERNIC_CONF', lxc_user_network_conf) + docconf.set('LXC_USERNIC_DB', lxc_user_network_db) + docconf.set('PACKAGE_VERSION', version_data.get('LXC_VERSION')) + docconf.set('docdtd', '"-//OASIS//DTD DocBook XML" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"') +-sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: false, version: '>=0.8') +-if not sgml2man.found() +- sgml2man = find_program('docbook2man', required: false, version: '<0.8') +- if sgml2man.found() +- docconf.set('docdtd', '"-//Davenport//DTD DocBook V3.0//EN"') +- elif want_mans +- error('missing required docbook2x or docbook-utils dependency') +- endif +-endif ++sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: false) + + ## Threads. + threads = dependency('threads') |