From 8c8c5abaa091c62206983dec5779f63e47a58d2b Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 27 Nov 2025 14:18:16 +0200
Subject: [PATCH 1/2] ovn: Fix command not found

Fixes https://www.github.com/NixOS/nixpkgs/issues/464825
---
 pkgs/by-name/ov/ovn/package.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix
index 6751a8123df7..404fe20bc9b5 100644
--- a/pkgs/by-name/ov/ovn/package.nix
+++ b/pkgs/by-name/ov/ovn/package.nix
@@ -15,6 +15,10 @@
   unbound,
   xdp-tools,
   openvswitch,
+  gawk,
+  coreutils,
+  gnugrep,
+  gnused,
   makeWrapper,
 }:
 let
@@ -117,7 +121,15 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${openvswitch}/share/openvswitch/scripts/ovs-lib $out/share/openvswitch/scripts/ovs-lib
 
     wrapProgram $out/share/ovn/scripts/ovn-ctl \
-      --prefix PATH : ${lib.makeBinPath [ openvswitch ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          openvswitch
+          gawk
+          coreutils # tr
+          gnugrep
+          gnused
+        ]
+      }
   '';
 
   env = {

From d4c5ec6fe39d03870bc1d7992069ba509506a1a2 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 27 Nov 2025 14:34:11 +0200
Subject: [PATCH 2/2] evolution: Fix command not found in the backup restore

Fixes https://www.github.com/NixOS/nixpkgs/issues/465392

There are many uses of these thus a wrapper is better than substituting

https://gitlab.gnome.org/search?group_id=8&nav_source=navbar&page=2&project_id=1604&repository_ref=master&search=gzip&search_code=true
---
 .../mailreaders/evolution/evolution/default.nix   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index d6d684302151..4fd070a9d4b6 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -42,6 +42,9 @@
   p11-kit,
   openldap,
   spamassassin,
+  gnutar,
+  gzip,
+  xz,
 }:
 
 stdenv.mkDerivation rec {
@@ -116,6 +119,18 @@ stdenv.mkDerivation rec {
     "-DWITH_OPENLDAP=${openldap}"
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : "${
+        lib.makeBinPath [
+          gnutar
+          gzip
+          xz
+        ]
+      }"
+    )
+  '';
+
   requiredSystemFeatures = [
     "big-parallel"
   ];