swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #285280 from adamcstephens/lxc/docbook-fix

Browse source 
lxc: fix aarch64 build failure
This commit is contained in:
Martin Weinelt 2024-01-31 16:21:51 +01:00 committed by GitHub
parent 52418a5183 184637940b
commit b9af749fff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/lxc/default.nix
View file

@ -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"

21
pkgs/os-specific/linux/lxc/docbook-hack.patch Normal file
View file

@ -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')