From 7ca075778d0c5f66fb5a98b1af06c9e2f46b7be4 Mon Sep 17 00:00:00 2001
From: marshmallow <git@althaea.zone>
Date: Fri, 24 Apr 2026 12:31:04 +1000
Subject: [PATCH] drop stdPath

---
 overlay.nix                      | 51 +++++++++++---------------------
 packages/affinity-v3/default.nix |  3 +-
 packages/affinity-v3/package.nix |  3 +-
 packages/affinity/default.nix    |  3 +-
 packages/affinity/package.nix    |  3 +-
 packages/default.nix             | 13 --------
 packages/wine/default.nix        |  3 +-
 packages/wine/packages.nix       |  3 +-
 packages/wine/wrapWithPrefix.nix |  4 +--
 9 files changed, 24 insertions(+), 62 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index d9d49d4..a907c59 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -2,38 +2,21 @@
 {
   flake.overlays.default =
     _final: prev:
-    withSystem prev.stdenv.hostPlatform.system (
-      _:
-      let
-        stdPath = pkgs: [
-          pkgs.zenity
-          pkgs.curl
-
-          pkgs.zstd
-          pkgs.coreutils
-          pkgs.gnused
-          pkgs.gnugrep
-          pkgs.wget
-
-          pkgs.busybox
-        ];
-      in
-      {
-        affinity-v3 = prev.callPackage ./packages/affinity-v3/package.nix {
-          inherit inputs stdPath;
-        };
-        affinity-photo = prev.callPackage ./packages/affinity/package.nix {
-          name = "Photo";
-          inherit inputs stdPath;
-        };
-        affinity-designer = prev.callPackage ./packages/affinity/package.nix {
-          name = "Designer";
-          inherit inputs stdPath;
-        };
-        affinity-publisher = prev.callPackage ./packages/affinity/package.nix {
-          name = "Publisher";
-          inherit inputs stdPath;
-        };
-      }
-    );
+    withSystem prev.stdenv.hostPlatform.system (_: {
+      affinity-v3 = prev.callPackage ./packages/affinity-v3/package.nix {
+        inherit inputs;
+      };
+      affinity-photo = prev.callPackage ./packages/affinity/package.nix {
+        name = "Photo";
+        inherit inputs;
+      };
+      affinity-designer = prev.callPackage ./packages/affinity/package.nix {
+        name = "Designer";
+        inherit inputs;
+      };
+      affinity-publisher = prev.callPackage ./packages/affinity/package.nix {
+        name = "Publisher";
+        inherit inputs;
+      };
+    });
 }
diff --git a/packages/affinity-v3/default.nix b/packages/affinity-v3/default.nix
index 6775e61..6d76191 100644
--- a/packages/affinity-v3/default.nix
+++ b/packages/affinity-v3/default.nix
@@ -4,7 +4,6 @@
     {
       pkgs,
       lib,
-      stdPath,
       self',
       warnUnfree,
       ...
@@ -13,7 +12,7 @@
       packages = {
         affinity-v3 = warnUnfree (
           pkgs.callPackage ./package.nix {
-            inherit inputs stdPath;
+            inherit inputs;
           }
         );
 
diff --git a/packages/affinity-v3/package.nix b/packages/affinity-v3/package.nix
index 61138cb..cc68908 100644
--- a/packages/affinity-v3/package.nix
+++ b/packages/affinity-v3/package.nix
@@ -3,13 +3,12 @@
   callPackage,
   stdenv,
   inputs,
-  stdPath,
   lib,
   ...
 }:
 let
   wine-packages = callPackage ../wine/packages.nix {
-    inherit inputs stdPath;
+    inherit inputs;
   };
 
   apl-combined = callPackage ../apl/apl-combined.nix {
diff --git a/packages/affinity/default.nix b/packages/affinity/default.nix
index 896324c..9cd6e0a 100644
--- a/packages/affinity/default.nix
+++ b/packages/affinity/default.nix
@@ -4,7 +4,6 @@
     {
       pkgs,
       lib,
-      stdPath,
       self',
       warnUnfree,
       ...
@@ -19,7 +18,7 @@
         name:
         warnUnfree (
           pkgs.callPackage ./package.nix {
-            inherit inputs stdPath name;
+            inherit inputs name;
           }
         );
     in
diff --git a/packages/affinity/package.nix b/packages/affinity/package.nix
index f347179..a196c51 100644
--- a/packages/affinity/package.nix
+++ b/packages/affinity/package.nix
@@ -5,12 +5,11 @@
   name,
   stdenv,
   inputs,
-  stdPath,
   ...
 }:
 let
   wine-packages = callPackage ../wine/packages.nix {
-    inherit inputs stdPath;
+    inherit inputs;
   };
 
   apl-combined = callPackage ../apl/apl-combined.nix {
diff --git a/packages/default.nix b/packages/default.nix
index 70a81ac..96b12ed 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -23,19 +23,6 @@
       };
 
       _module.args = {
-        stdPath = pkgs: [
-          pkgs.zenity
-          pkgs.curl
-
-          pkgs.zstd
-          pkgs.coreutils
-          pkgs.gnused
-          pkgs.gnugrep
-          pkgs.wget
-
-          pkgs.busybox
-        ];
-
         warnUnfree =
           pkg:
           lib.warn "For users of affinity-nix through NixOS, Home Manager, nix-darwin, or similar: please switch to consuming this package through the `affinity-nix.overlays.default` overlay. It will become `unfree` in the future, making it impossible to declaratively consume without an overlay." pkg;
diff --git a/packages/wine/default.nix b/packages/wine/default.nix
index bf108dd..6d94cdb 100644
--- a/packages/wine/default.nix
+++ b/packages/wine/default.nix
@@ -3,12 +3,11 @@
   perSystem =
     {
       pkgs,
-      stdPath,
       ...
     }:
     let
       wine-packages = pkgs.callPackage ./packages.nix {
-        inherit stdPath inputs;
+        inherit inputs;
       };
     in
     {
diff --git a/packages/wine/packages.nix b/packages/wine/packages.nix
index eef710d..961ee44 100644
--- a/packages/wine/packages.nix
+++ b/packages/wine/packages.nix
@@ -3,7 +3,7 @@
   callPackage,
   pkgs,
   inputs,
-  stdPath,
+  ...
 }:
 let
   wineUnstable =
@@ -23,7 +23,6 @@ let
 
   wrapWithPrefix = callPackage ./wrapWithPrefix.nix {
     inherit wineUnwrapped;
-    stdPath = stdPath pkgs;
   };
 in
 {
diff --git a/packages/wine/wrapWithPrefix.nix b/packages/wine/wrapWithPrefix.nix
index d860bd5..16c3c41 100644
--- a/packages/wine/wrapWithPrefix.nix
+++ b/packages/wine/wrapWithPrefix.nix
@@ -3,7 +3,6 @@
   lib,
   pkgs,
   wineUnwrapped,
-  stdPath,
 }:
 pkg: pname:
 stdenv.mkDerivation rec {
@@ -16,8 +15,7 @@ stdenv.mkDerivation rec {
       --set WINESERVER "${lib.getExe' wineUnwrapped "wineserver"}" \
       --set WINELOADER "${lib.getExe' wineUnwrapped "wine"}" \
       --set WINEDLLPATH "${wineUnwrapped}/lib/wine" \
-      --set WINE "${lib.getExe' wineUnwrapped "wine"}" \
-      --set PATH "${lib.makeBinPath stdPath}"
+      --set WINE "${lib.getExe' wineUnwrapped "wine"}"
   '';
   meta.mainProgram = name;
 }