From 81b728b3eb6c9a03663ac98d0dee6df9a86cd6e5 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 23 Aug 2025 01:46:37 -0400 Subject: [PATCH 1/2] virt-top: fix build for gettext 0.25 --- pkgs/applications/virtualization/virt-top/default.nix | 4 ++++ .../virtualization/virt-top/gettext-0.25.patch | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/virtualization/virt-top/gettext-0.25.patch diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 732aa7d11b08..2a29b0db8b2a 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { hash = "sha256-C1a47pWtjb38bnwmZ2Zq7/LlW3+BF5BGNMRFi97/ngU="; }; + patches = [ + ./gettext-0.25.patch + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/virt-top/gettext-0.25.patch b/pkgs/applications/virtualization/virt-top/gettext-0.25.patch new file mode 100644 index 000000000000..476dbf7d722c --- /dev/null +++ b/pkgs/applications/virtualization/virt-top/gettext-0.25.patch @@ -0,0 +1,10 @@ +--- a/configure.ac.orig 2025-08-23 01:41:53 ++++ b/configure.ac 2025-08-23 01:42:14 +@@ -123,6 +123,7 @@ + + dnl Check for gettext. + AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.25]) + + dnl Write gettext modules for the programs. + dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html From 3dc3043c54f3f2e0e0b8f2e47d22708114593399 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 23 Aug 2025 01:49:42 -0400 Subject: [PATCH 2/2] virt-top: modernize --- pkgs/applications/virtualization/virt-top/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 2a29b0db8b2a..04844d214c67 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -44,16 +44,16 @@ stdenv.mkDerivation rec { ++ [ libxml2 ]; prePatch = '' - substituteInPlace ocaml-dep.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}' - substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}' + substituteInPlace ocaml-dep.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}' + substituteInPlace ocaml-link.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}' ''; - meta = with lib; { + meta = { description = "Top-like utility for showing stats of virtualized domains"; homepage = "https://people.redhat.com/~rjones/virt-top/"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "virt-top"; }; }