From 30826d6035ffff0ccc16b53f5f42111661214882 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Feb 2023 17:03:26 +0200 Subject: [PATCH 1/2] tevent: copy cross fix from talloc & add libxcrypt testing pyembed configuration : Could not build a python embedded interpreter tevent-aarch64-unknown-linux-gnu> In file included from ../../pytevent.c:26: tevent-aarch64-unknown-linux-gnu> ../../lib/replace/replace.h:885:10: fatal error: crypt.h: No such file or directory tevent-aarch64-unknown-linux-gnu> 885 | #include tevent-aarch64-unknown-linux-gnu> | ^~~~~~~~~ tevent-aarch64-unknown-linux-gnu> compilation terminated. --- pkgs/development/libraries/tevent/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index f10235650c4a..7b798d00b01e 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -10,6 +10,7 @@ , docbook_xml_dtd_42 , which , wafHook +, libxcrypt }: stdenv.mkDerivation rec { @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { cmocka readline # required to build python talloc + libxcrypt ]; # otherwise the configure script fails with @@ -52,6 +54,11 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + meta = with lib; { description = "An event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; From 0d4a49af8670cf2adf2e23a65830ca4e0bdbe4b2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Feb 2023 17:52:13 +0200 Subject: [PATCH 2/2] ldb: fix cross & add libxcrypt ERROR: Python module pytdb of version 1.4.7 not found, and bundling disabled --- pkgs/development/libraries/ldb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 37856f5a0130..bdd630103e37 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_42 , cmocka , wafHook +, libxcrypt }: stdenv.mkDerivation rec { @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 + tdb + tevent ]; buildInputs = [ @@ -42,6 +45,7 @@ stdenv.mkDerivation rec { tevent popt cmocka + libxcrypt ]; # otherwise the configure script fails with