From 30de8056910aa858d6feb4b0fb436727c4941b61 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 1 Apr 2025 13:13:08 +0200 Subject: [PATCH 1/3] itstool: fix cross --- pkgs/by-name/it/itstool/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/it/itstool/package.nix b/pkgs/by-name/it/itstool/package.nix index 7ef080da6d19..d0c4869c6d84 100644 --- a/pkgs/by-name/it/itstool/package.nix +++ b/pkgs/by-name/it/itstool/package.nix @@ -3,6 +3,7 @@ lib, fetchurl, python3, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -16,14 +17,18 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ - python3 - python3.pkgs.wrapPython - ]; + postPatch = '' + # Do not let autoconf find Python, but set it directly. This fixes cross-compilation. + substituteInPlace configure.ac \ + --replace-fail 'AM_PATH_PYTHON([2.6])' "" \ + --replace-fail 'AC_MSG_ERROR(Python module $py_module is needed to run this package)' "" + substituteInPlace itstool.in \ + --replace-fail "@PYTHON@" "${python3.interpreter}" + ''; - buildInputs = [ - python3 - python3.pkgs.libxml2 + nativeBuildInputs = [ + autoreconfHook + python3.pkgs.wrapPython ]; pythonPath = [ From 08ba5fa492cb600a911112b47ee16dc75d52a9b5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 1 Apr 2025 13:13:38 +0200 Subject: [PATCH 2/3] itstool: add upstream patch to fix python warnings --- pkgs/by-name/it/itstool/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/it/itstool/package.nix b/pkgs/by-name/it/itstool/package.nix index d0c4869c6d84..2dcb01182a67 100644 --- a/pkgs/by-name/it/itstool/package.nix +++ b/pkgs/by-name/it/itstool/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, python3, autoreconfHook, }: @@ -15,6 +16,15 @@ stdenv.mkDerivation rec { hash = "sha256-a5p80poSu5VZj1dQ6HY87niDahogf4W3TYsydbJ+h8o="; }; + patches = [ + # https://github.com/itstool/itstool/pull/51 + (fetchpatch { + name = "fix-insufficiently-quoted-regular-expressions-pr51"; + url = "https://github.com/itstool/itstool/commit/19f9580f27aa261ea383b395fdef7e153f3f9e6d.patch"; + hash = "sha256-5J4mRXQu24o2rqVtaXN/ETgj6A8R0Ym+YkZhqhZTzIc="; + }) + ]; + strictDeps = true; postPatch = '' From f0a2fe518f04d724732bc49004dc41b034a975e4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 1 Apr 2025 13:13:47 +0200 Subject: [PATCH 3/3] itstool: add versionCheckHook --- pkgs/by-name/it/itstool/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/it/itstool/package.nix b/pkgs/by-name/it/itstool/package.nix index 2dcb01182a67..78c196c15f3c 100644 --- a/pkgs/by-name/it/itstool/package.nix +++ b/pkgs/by-name/it/itstool/package.nix @@ -5,6 +5,7 @@ fetchpatch, python3, autoreconfHook, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -49,6 +50,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { homepage = "https://itstool.org/"; description = "XML to PO and back again";