From a89985fde98ee472efe700afd9fa452da728bf89 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 8 Feb 2025 18:47:25 +0100
Subject: [PATCH] rcu: 2024.001q -> 2025.001r

---
 pkgs/by-name/rc/rcu/package.nix | 34 ++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 5fb9220ede66..7722b1c8344f 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -6,17 +6,21 @@
   rcu,
   testers,
   copyDesktopItems,
+  coreutils,
   desktopToDarwinBundle,
+  gnutar,
   libsForQt5,
   makeDesktopItem,
+  nettools,
   protobuf,
   python3Packages,
   system-config-printer,
+  wget,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "2024.001q";
+  version = "2025.001r";
 
   format = "other";
 
@@ -24,8 +28,8 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-d${version}-source.tar.gz";
-        hash = "sha256-Ywk28gJBMSSQL6jEcHE8h253KOsXIGwVOag6PBWs8kg=";
-        url = "http://www.davisr.me/projects/rcu/";
+        hash = "sha256-3pTfe0ytcvLnO65S0Uqrv/IBoidpEIQXqkcIG354hUU=";
+        url = "https://www.davisr.me/projects/rcu/";
       };
     in
     runCommand "${src-tarball.name}-unpacked" { } ''
@@ -48,6 +52,10 @@ python3Packages.buildPythonApplication rec {
     # This must match the protobuf version imported at runtime, regenerate it
     rm src/model/update_metadata_pb2.py
     protoc --proto_path src/model src/model/update_metadata.proto --python_out=src/model
+
+    # We don't make it available at this location, wrapping adds it to PATH instead
+    substituteInPlace src/model/document.py \
+      --replace-fail '/sbin/ifconfig' 'ifconfig'
   '';
 
   nativeBuildInputs =
@@ -134,9 +142,21 @@ python3Packages.buildPythonApplication rec {
     ''
       makeWrapperArgs+=(
         "''${qtWrapperArgs[@]}"
+        --prefix PATH : ${
+          lib.makeBinPath [
+            coreutils
+            gnutar
+            wget
+          ]
+        }
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
-      --prefix PATH : ${lib.makeBinPath [ system-config-printer ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          nettools
+          system-config-printer
+        ]
+      }
     ''
     + ''
       )
@@ -164,12 +184,12 @@ python3Packages.buildPythonApplication rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     mainProgram = "rcu";
     description = "All-in-one offline/local management software for reMarkable e-paper tablets";
     homepage = "http://www.davisr.me/projects/rcu/";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ OPNA2608 ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
     hydraPlatforms = [ ]; # requireFile used as src
   };
 }