Skip to content

Commit 7d4cd94

Browse files
apt, dpkg: fix cross build (#372955)
2 parents ef56e77 + e289913 commit 7d4cd94

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

pkgs/by-name/ap/apt/package.nix

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,23 @@ stdenv.mkDerivation (finalAttrs: {
4949
"man"
5050
];
5151

52-
nativeBuildInputs = [
53-
cmake
54-
gtest
55-
(lib.getBin libxslt)
56-
pkg-config
57-
triehash
58-
];
52+
nativeBuildInputs =
53+
[
54+
cmake
55+
dpkg # dpkg-architecture
56+
gettext # msgfmt
57+
gtest
58+
(lib.getBin libxslt)
59+
pkg-config
60+
triehash
61+
perlPackages.perl
62+
]
63+
++ lib.optionals withDocs [
64+
docbook_xml_dtd_45
65+
doxygen
66+
perlPackages.Po4a
67+
w3m
68+
];
5969

6070
buildInputs =
6171
[
@@ -64,30 +74,25 @@ stdenv.mkDerivation (finalAttrs: {
6474
db
6575
dpkg
6676
gnutls
77+
gtest
6778
libgcrypt
6879
libgpg-error
6980
libseccomp
7081
libtasn1
7182
lz4
7283
p11-kit
73-
perlPackages.perl
7484
udev
7585
xxHash
7686
xz
7787
zstd
7888
]
79-
++ lib.optionals withDocs [
80-
docbook_xml_dtd_45
81-
doxygen
82-
perlPackages.Po4a
83-
w3m
84-
]
8589
++ lib.optionals withNLS [
8690
gettext
8791
];
8892

8993
cmakeFlags = [
9094
(lib.cmakeOptionType "filepath" "BERKELEY_INCLUDE_DIRS" "${lib.getDev db}/include")
95+
(lib.cmakeOptionType "filepath" "DPKG_DATADIR" "${dpkg}/share/dpkg")
9196
(lib.cmakeOptionType "filepath" "DOCBOOK_XSL" "${docbook_xsl}/share/xml/docbook-xsl")
9297
(lib.cmakeOptionType "filepath" "GNUTLS_INCLUDE_DIR" "${lib.getDev gnutls}/include")
9398
(lib.cmakeFeature "DROOT_GROUP" "root")

pkgs/by-name/dp/dpkg/package.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@ stdenv.mkDerivation rec {
4949
for i in $(find . -name Makefile.in); do
5050
substituteInPlace $i --replace "install-data-local:" "disabled:" ;
5151
done
52+
53+
# Skip check broken when cross-compiling.
54+
substituteInPlace configure \
55+
--replace-fail 'as_fn_error $? "cannot find a GNU tar program"' "#"
5256
'';
5357

5458
postPatch = ''
55-
patchShebangs .
59+
patchShebangs --host .
5660
5761
# Dpkg commands sometimes calls out to shell commands
5862
substituteInPlace lib/dpkg/dpkg.h \

0 commit comments

Comments
 (0)