From 4fa1ac3121138d45dc3949563fab44c8fb1f10f4 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 15 Mar 2023 04:50:22 +0000 Subject: fuzzel: add pkg-config to depsBuildBuild to support cross compilation --- pkgs/applications/misc/fuzzel/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index e8df14911bf..5ee5d162fa2 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-Va/Rm35jqxDlIfQdrpZ41qrW8YzWmm1LWra76AW1xUw="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ pkg-config wayland-scanner -- cgit 1.4.1 From 38f82eb826a792d78ae836932513e000ff5d0d83 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 15 Mar 2023 06:29:56 +0000 Subject: libchamplain: don't build docs when cross compiling --- pkgs/development/libraries/libchamplain/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 1eda49ad3f9..ab8f187bf9e 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { pname = "libchamplain"; version = "0.12.21"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { pkg-config gobject-introspection vala + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ gtk-doc docbook_xsl docbook_xml_dtd_412 @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + (lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform)) "-Dvapi=true" (lib.mesonBool "libsoup3" withLibsoup3) ]; -- cgit 1.4.1 From c82580fd11955f020104fc839da032534a582e1e Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 15 Mar 2023 06:31:58 +0000 Subject: libHX: move libtool into nativeBuildInputs to unbreak cross compilation --- pkgs/development/libraries/libHX/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index e7172b493c7..7016c5c8659 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { patches = []; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool ]; + nativeBuildInputs = [ autoconf automake libtool ]; preConfigure = '' sh autogen.sh - ''; + ''; meta = with lib; { homepage = "https://libhx.sourceforge.net/"; -- cgit 1.4.1 From 2231d4882472033c2f7a2042531af3e82421b6a8 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 7 Apr 2023 03:29:47 +0000 Subject: librest (0.8): don't build docs when cross compiling librest_1_0 supports cross compilation (in staging: https://github.com/NixOS/nixpkgs/pull/223142), but the old 0.8 version still doesn't. unlike 1.0 -- which builds with meson -- librest 0.8 uses autotools with no obvious way to tell `configure` to use the native gtk-doc, so just skip docs for cross builds of this older version. --- pkgs/development/libraries/librest/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index abe53ff3692..19f7ced5986 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gobject-introspection + ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ gtk-doc docbook-xsl-nons docbook_xml_dtd_412 @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-gtk-doc" + (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "gtk-doc") # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; -- cgit 1.4.1 From 4f8d22c137d0244dbd30e0c3b57d8004dca8b2c2 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 15 Mar 2023 08:02:46 +0000 Subject: rapidfuzz-cpp: disable tests when cross compiling --- pkgs/development/libraries/rapidfuzz-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index d1524024dd4..9cde99b69f0 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { catch2_3 ]; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = { description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; -- cgit 1.4.1 From 4e7d68aa63f809edcf589081d9a18693597b38b2 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 7 Apr 2023 03:21:17 +0000 Subject: libjcat: support cross compilation gnutls' certtool binary is required by libjcat during build (`data/tests/meson.build`), and gnutls is linked into the libjcat.so target, hence it appears in both nativeBuildInputs and buildInputs. --- pkgs/development/libraries/libjcat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 8c052b5ce80..65ea75f2faa 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons gobject-introspection vala + gnutls gtk-doc python3 ]; -- cgit 1.4.1 From a08a67a563d1285fb306159a92bb33b2c4e8ce7f Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 7 Apr 2023 03:56:37 +0000 Subject: tpm2-abrmd: support cross compilation the build process requires gdbus-codegen, achieved by adding `glib` to `nativeBuildInputs` --- pkgs/tools/security/tpm2-abrmd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index d9dd354aac8..71835599879 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -15,7 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-l0ncCMsStaeFACRU3Bt6F1zyiOTGY6wOHewA4AD58Ww="; }; - nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + glib + makeWrapper + pkg-config + which + ]; buildInputs = [ tpm2-tss glib dbus ]; nativeCheckInputs = [ cmocka ]; -- cgit 1.4.1