From f37551d71e24f0dcc38b43d6c96acd8f1c5215c8 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:52 +0100
Subject: [PATCH 01/40] arubaotp-seed-extractor: expand pythonPath bash array
 for structuredAttrs

---
 pkgs/by-name/ar/arubaotp-seed-extractor/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix
index 09474578ee73..17df0d4ae94f 100644
--- a/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix
+++ b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication {
     mkdir -p "$libdir"
     cp scripts/* "$libdir"
     chmod +x "$libdir/main.py"
-    wrapPythonProgramsIn "$libdir" "$pythonPath"
+    wrapPythonProgramsIn "$libdir" "''${pythonPath[*]}"
     mkdir -p $out/bin
     ln -s "$libdir/main.py" $out/bin/arubaotp-seed-extractor
   '';

From 01192044152b27bc45d7161b42048f8f56ece32a Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:56 +0100
Subject: [PATCH 02/40] bada-bib: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/ba/bada-bib/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/bada-bib/package.nix b/pkgs/by-name/ba/bada-bib/package.nix
index db5081f25753..84a31e1f89cf 100644
--- a/pkgs/by-name/ba/bada-bib/package.nix
+++ b/pkgs/by-name/ba/bada-bib/package.nix
@@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 9a32c795b3ae0526f2ee0b331dac5d017b85a6d8 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:56 +0100
Subject: [PATCH 03/40] bcc: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/bc/bcc/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix
index 4d28265f8c64..ccc87a826181 100644
--- a/pkgs/by-name/bc/bcc/package.nix
+++ b/pkgs/by-name/bc/bcc/package.nix
@@ -118,7 +118,7 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "bcc" ];
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/bcc/tools" "$out ''${pythonPath[*]}"
   '';
 
   outputs = [

From 6a21526c7d0e665640c523edaf0d4b9fc7e4aa8c Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:57 +0100
Subject: [PATCH 04/40] better-control: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/be/better-control/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/be/better-control/package.nix b/pkgs/by-name/be/better-control/package.nix
index 0fdd29c4c0c4..4d1db6f4fbe0 100644
--- a/pkgs/by-name/be/better-control/package.nix
+++ b/pkgs/by-name/be/better-control/package.nix
@@ -88,7 +88,7 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/share/better-control" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/better-control" "$out ''${pythonPath[*]}"
   '';
 
   passthru.updateScript = nix-update-script { };

From a29c99cc86bd6bfad9ce50dd4d3505f3e6931f56 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:57 +0100
Subject: [PATCH 05/40] blueberry: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/bl/blueberry/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix
index 9c0462c54985..f8c1bdedce49 100644
--- a/pkgs/by-name/bl/blueberry/package.nix
+++ b/pkgs/by-name/bl/blueberry/package.nix
@@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec {
 
   postFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-    wrapPythonProgramsIn $out/lib "$out $pythonPath"
+    wrapPythonProgramsIn $out/lib "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 5fac97217df1d2ed31f8ecc6bf1445044f8391e0 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:57 +0100
Subject: [PATCH 06/40] blueman: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/bl/blueman/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blueman/package.nix b/pkgs/by-name/bl/blueman/package.nix
index 8255698f799d..b859efccfed5 100644
--- a/pkgs/by-name/bl/blueman/package.nix
+++ b/pkgs/by-name/bl/blueman/package.nix
@@ -89,8 +89,8 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     # This mimics ../../../development/interpreters/python/wrap.sh
-    wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
-    wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
+    wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 52cf3764837c94389b85b934b2c62820f0143d70 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:58 +0100
Subject: [PATCH 07/40] botamusique: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/bo/botamusique/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/botamusique/package.nix b/pkgs/by-name/bo/botamusique/package.nix
index 1b2702ac5734..55b85a96111d 100644
--- a/pkgs/by-name/bo/botamusique/package.nix
+++ b/pkgs/by-name/bo/botamusique/package.nix
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share $out/bin
     cp -r . $out/share/botamusique
     chmod +x $out/share/botamusique/mumbleBot.py
-    wrapPythonProgramsIn $out/share/botamusique "$out $pythonPath"
+    wrapPythonProgramsIn $out/share/botamusique "$out ''${pythonPath[*]}"
 
     # Convenience binary and wrap with ffmpeg dependency
     makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \

From cc06a99d75c8b2be941ea37744225d1298aa2c51 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:58 +0100
Subject: [PATCH 08/40] cambalache: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/ca/cambalache/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cambalache/package.nix b/pkgs/by-name/ca/cambalache/package.nix
index 984ea63e4c20..fb57a4edbab5 100644
--- a/pkgs/by-name/ca/cambalache/package.nix
+++ b/pkgs/by-name/ca/cambalache/package.nix
@@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication rec {
 
   postFixup = ''
     # Wrap a helper script in an unusual location.
-    wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out ''${pythonPath[*]}"
   '';
 
   passthru = {

From dc005ce4f16e5cbc792c669399a2062ee4099152 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:58 +0100
Subject: [PATCH 09/40] carla: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/ca/carla/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/carla/package.nix b/pkgs/by-name/ca/carla/package.nix
index 5e89d64292bf..8304378c4c7c 100644
--- a/pkgs/by-name/ca/carla/package.nix
+++ b/pkgs/by-name/ca/carla/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     # Also sets program_PYTHONPATH and program_PATH variables
     wrapPythonPrograms
-    wrapPythonProgramsIn "$out/share/carla/resources" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/carla/resources" "$out ''${pythonPath[*]}"
 
     find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
       patchPythonScript "$f"

From f369ad8ba382d19d58d814a353aeadaa29f6aaa2 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:58 +0100
Subject: [PATCH 10/40] cartridges: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/ca/cartridges/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix
index f7dbb0751844..782d47f455da 100644
--- a/pkgs/by-name/ca/cartridges/package.nix
+++ b/pkgs/by-name/ca/cartridges/package.nix
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
   makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
 
   postFixup = ''
-    wrapPythonProgramsIn $out/libexec $out $pythonPath
+    wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}"
   '';
 
   # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase

From 2df76c20203f84883d1c28cbf160b37f7f5655f8 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:59 +0100
Subject: [PATCH 11/40] duplicity: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/du/duplicity/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index 8dc193ec0e6e..7cdb8eff47f2 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -143,7 +143,7 @@ let
       # tests need writable $HOME
       HOME=$PWD/.home
 
-      wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$pythonPath"
+      wrapPythonProgramsIn "$PWD/testing/overrides/bin" "''${pythonPath[*]}"
     '';
 
     doCheck = true;

From ff7f25bcedef6863d6eb5ea310903978381b9222 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:59 +0100
Subject: [PATCH 12/40] fast-downward: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/fa/fast-downward/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix
index a3a7d1a48248..7b379a5017c8 100644
--- a/pkgs/by-name/fa/fast-downward/package.nix
+++ b/pkgs/by-name/fa/fast-downward/package.nix
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/${python3.sitePackages}
     cp -r driver $out/${python3.sitePackages}
 
-    wrapPythonProgramsIn $out/bin "$out $pythonPath"
-    wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath"
+    wrapPythonProgramsIn $out/bin "$out ''${pythonPath[*]}"
+    wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out ''${pythonPath[*]}"
     # Because fast-downward calls `python translate.py` we need to return wrapped scripts back.
     for i in $out/libexec/fast-downward/translate/.*-wrapped; do
       name="$(basename "$i")"

From 9f80fee30d472567545cdc45b76fb3bb73eb38ca Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:59 +0100
Subject: [PATCH 13/40] fio: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/fi/fio/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fio/package.nix b/pkgs/by-name/fi/fio/package.nix
index a5fd7b26072c..4450b03001df 100644
--- a/pkgs/by-name/fi/fio/package.nix
+++ b/pkgs/by-name/fi/fio/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 13e4a3afae106a3176c15a91550aad27ad86522c Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:33:59 +0100
Subject: [PATCH 14/40] gdal: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/gd/gdal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index e788c5123485..ea009b46261b 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -221,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pythonPath = [ python3Packages.numpy ];
   postInstall = ''
-    wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
   ''
   + lib.optionalString useJava ''
     cd $out/lib

From b84edca4c51d1d24329b805684fb540546f8c60a Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:00 +0100
Subject: [PATCH 15/40] gnome-tweaks: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/gn/gnome-tweaks/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix
index 3e4afc36e2f1..1a2f81b2bebb 100644
--- a/pkgs/by-name/gn/gnome-tweaks/package.nix
+++ b/pkgs/by-name/gn/gnome-tweaks/package.nix
@@ -79,7 +79,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
   '';
 
   passthru = {

From d08fc48ef43d193dde735b399572e3eece924f49 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:00 +0100
Subject: [PATCH 16/40] gpsd: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/gp/gpsd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 9cdd4b352dc1..66df5e3c6b95 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # remove binaries for x-less install because xgps sconsflag is partially broken
   postFixup = ''
-    wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    wrapPythonProgramsIn $out/bin "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From ca797d54258c8e9216a6c5f5745ac6af4e2a575e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:00 +0100
Subject: [PATCH 17/40] hamster: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/ha/hamster/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ha/hamster/package.nix b/pkgs/by-name/ha/hamster/package.nix
index edd963ee9b5c..ea37f4237962 100644
--- a/pkgs/by-name/ha/hamster/package.nix
+++ b/pkgs/by-name/ha/hamster/package.nix
@@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn $out/libexec "$out $pythonPath"
+    wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 8e610063c8f04487f1c56b650aa06d40b1af56d9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:00 +0100
Subject: [PATCH 18/40] ingen: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/in/ingen/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/ingen/package.nix b/pkgs/by-name/in/ingen/package.nix
index 81bd40c8207a..f4668ea2f31d 100644
--- a/pkgs/by-name/in/ingen/package.nix
+++ b/pkgs/by-name/in/ingen/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
   ];
 
   postInstall = ''
-    wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}"
     wrapProgram "$out/bin/ingen" --set INGEN_UI_PATH "$out/share/ingen/ingen_gui.ui"
   '';
 

From 68db3ce1adc3efb3e23de8503854f178384cf7e6 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:01 +0100
Subject: [PATCH 19/40] koboldcpp: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/ko/koboldcpp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 77c6df960b9b..72e31aeac710 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -116,7 +116,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/bin" "$pythonPath"
+    wrapPythonProgramsIn "$out/bin" "''${pythonPath[*]}"
     makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \
       --prefix PATH : ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs}
   '';

From e71719bc6c64096c5e646dd13bf681e17555d484 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:01 +0100
Subject: [PATCH 20/40] mininet: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/mi/mininet/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/mininet/package.nix b/pkgs/by-name/mi/mininet/package.nix
index 9550417068e6..5f57a874aa91 100644
--- a/pkgs/by-name/mi/mininet/package.nix
+++ b/pkgs/by-name/mi/mininet/package.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/bin" "$py $pythonPath"
+    wrapPythonProgramsIn "$out/bin" "$py ''${pythonPath[*]}"
     wrapProgram "$out/bin/mnexec" \
       --prefix PATH : "${generatedPath}"
     wrapProgram "$out/bin/mn" \

From e7eb3f278bacef477a3d446bb059a4f1c1a2fe6e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:01 +0100
Subject: [PATCH 21/40] neard: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/ne/neard/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/neard/package.nix b/pkgs/by-name/ne/neard/package.nix
index 947fe729a231..963168dfd6fc 100644
--- a/pkgs/by-name/ne/neard/package.nix
+++ b/pkgs/by-name/ne/neard/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-    wrapPythonProgramsIn "$out/lib/neard" "$pythonPath"
+    wrapPythonProgramsIn "$out/lib/neard" "''${pythonPath[*]}"
   '';
 
   meta = {

From dd12744557ecbc44881f89cede7f76a0d44640ab Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:01 +0100
Subject: [PATCH 22/40] open-fprintd: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/op/open-fprintd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix
index 6ddfed95dd47..d0f61119f0ce 100644
--- a/pkgs/by-name/op/open-fprintd/package.nix
+++ b/pkgs/by-name/op/open-fprintd/package.nix
@@ -49,7 +49,7 @@ python3Packages.buildPythonPackage rec {
   makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/lib/open-fprintd" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 488b153a97a147c0d671094f8b628ef104141364 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:02 +0100
Subject: [PATCH 23/40] openbox: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/op/openbox/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix
index 306cdd851948..8281275cb594 100644
--- a/pkgs/by-name/op/openbox/package.nix
+++ b/pkgs/by-name/op/openbox/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
-    wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 978cba717358e06a5120a638cb3c8a1d87635b91 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:02 +0100
Subject: [PATCH 24/40] patchance: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/pa/patchance/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pa/patchance/package.nix b/pkgs/by-name/pa/patchance/package.nix
index 04f9d2cdca17..1db0ef140796 100644
--- a/pkgs/by-name/pa/patchance/package.nix
+++ b/pkgs/by-name/pa/patchance/package.nix
@@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/patchance/src" "$out ''${pythonPath[*]}"
     for file in $out/bin/*; do
       wrapQtApp "$file"
     done

From 27017db74559cf00632eaea250016ab88e4f2ac9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:02 +0100
Subject: [PATCH 25/40] pince: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/pi/pince/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pi/pince/package.nix b/pkgs/by-name/pi/pince/package.nix
index 44e0a0e2a7dd..5786610043ec 100644
--- a/pkgs/by-name/pi/pince/package.nix
+++ b/pkgs/by-name/pi/pince/package.nix
@@ -164,7 +164,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/lib/pince" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/lib/pince" "$out ''${pythonPath[*]}"
   '';
 
   passthru = {

From 4a5c266019ad3f07cb6d780414900f326ca2eff9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:03 +0100
Subject: [PATCH 26/40] pokete: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/po/pokete/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/pokete/package.nix b/pkgs/by-name/po/pokete/package.nix
index a0ab1709dd02..357047356d24 100644
--- a/pkgs/by-name/po/pokete/package.nix
+++ b/pkgs/by-name/po/pokete/package.nix
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn $out/share/pokete "$pythonPath"
+    wrapPythonProgramsIn $out/share/pokete "''${pythonPath[*]}"
   '';
 
   passthru.tests = {

From 38ead325074a8431abf56fbd88db75acad8ce5e1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:03 +0100
Subject: [PATCH 27/40] raysession: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/ra/raysession/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/raysession/package.nix b/pkgs/by-name/ra/raysession/package.nix
index 914be3150f61..8314bb5b85e0 100644
--- a/pkgs/by-name/ra/raysession/package.nix
+++ b/pkgs/by-name/ra/raysession/package.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/raysession/src" "$out ''${pythonPath[*]}"
     for file in $out/bin/*; do
       wrapQtApp "$file"
     done

From 324839571ed14911ff0b2f010df7ffb16231a3f1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:03 +0100
Subject: [PATCH 28/40] tuhi: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/tu/tuhi/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tu/tuhi/package.nix b/pkgs/by-name/tu/tuhi/package.nix
index afa77bd2f295..36b503e6e31c 100644
--- a/pkgs/by-name/tu/tuhi/package.nix
+++ b/pkgs/by-name/tu/tuhi/package.nix
@@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
       --replace "/usr/bin/env sh" "sh"
   '';
   postFixup = ''
-    wrapPythonProgramsIn $out/libexec "$out $pythonPath"
+    wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 0de6d274a8e5f540dc52d4146dd8b1b4375dc012 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:03 +0100
Subject: [PATCH 29/40] wike: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/wi/wike/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix
index b01cd436151a..5410baeb5dab 100644
--- a/pkgs/by-name/wi/wike/package.nix
+++ b/pkgs/by-name/wi/wike/package.nix
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
   postFixup = ''
-    wrapPythonProgramsIn "$out/share/wike" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/wike" "$out ''${pythonPath[*]}"
   '';
 
   passthru = {

From 18ff192eabe91b134b221c48de9c8d058334eda9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:04 +0100
Subject: [PATCH 30/40] xen: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/xe/xen/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index 03c634a84b7a..f68206899ec6 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -317,7 +317,7 @@ stdenv.mkDerivation (finalAttrs: {
     # We also need to wrap pygrub, which lies in $out/libexec/xen/bin.
     ''
       wrapPythonPrograms
-      wrapPythonProgramsIn "$out/libexec/xen/bin" "$out $pythonPath"
+      wrapPythonProgramsIn "$out/libexec/xen/bin" "$out ''${pythonPath[*]}"
     '';
 
   postFixup = ''

From 87fbf6d34cee85fdc07658996cd642cf2efc0460 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:04 +0100
Subject: [PATCH 31/40] xfce4-dockbarx-plugin: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix b/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix
index a20c8f3a9e60..581f39005fa6 100644
--- a/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
     chmod +x $out/share/dockbarx/xfce4-panel-plug
-    wrapPythonProgramsIn "$out/share/dockbarx" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/dockbarx" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 8ab60df552657a1a6af4c7eb8ba261e68de47a9e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:04 +0100
Subject: [PATCH 32/40] xtf: expand pythonPath bash array for structuredAttrs

---
 pkgs/by-name/xt/xtf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xt/xtf/package.nix b/pkgs/by-name/xt/xtf/package.nix
index 80fc617684a6..8102cea82101 100644
--- a/pkgs/by-name/xt/xtf/package.nix
+++ b/pkgs/by-name/xt/xtf/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
     # This is necessary because the real xtf-runner should
     # be in the same directory as the tests/ directory.
     + ''
-      wrapPythonProgramsIn "''${!outputBin}/share/xtf" "''${!outputBin} $pythonPath"
+      wrapPythonProgramsIn "''${!outputBin}/share/xtf" "''${!outputBin} ''${pythonPath[*]}"
       mkdir -p ''${!outputBin}/bin
       ln -s ''${!outputBin}/share/xtf/xtf-runner ''${!outputBin}/bin/xtf-runner
     '';

From 9693640154a61c6f048c6fece4a3efae348387d9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:24 +0100
Subject: [PATCH 33/40] dupeguru: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/applications/misc/dupeguru/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index 9432ebdfcf4e..06af2c764027 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec {
   # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
   # so wrapPythonPrograms hook does not handle it automatically.
   postFixup = ''
-    wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/dupeguru" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From c851206cb52fadb7a0be13d0ff3bf0ff6f2574ee Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:41 +0100
Subject: [PATCH 34/40] easycrypt: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/applications/science/logic/easycrypt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix
index bbc37bb7dcd5..b23e7c110863 100644
--- a/pkgs/applications/science/logic/easycrypt/default.nix
+++ b/pkgs/applications/science/logic/easycrypt/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     runHook preInstall
     dune install --prefix $out easycrypt
     rm $out/bin/ec-runtest
-    wrapPythonProgramsIn "$out/lib/easycrypt/commands" "$pythonPath"
+    wrapPythonProgramsIn "$out/lib/easycrypt/commands" "''${pythonPath[*]}"
     runHook postInstall
   '';
 

From b4124a99fc927fc9332c3768aef79a8f6e76bdf7 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:34:53 +0100
Subject: [PATCH 35/40] sumorobot-manager: expand pythonPath bash array for
 structuredAttrs

---
 .../applications/science/robotics/sumorobot-manager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index f6f846bc4585..64539e3f8aee 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     patchShebangs $out/opt/sumorobot-manager/main.py
-    wrapPythonProgramsIn "$out/opt" "$pythonPath"
+    wrapPythonProgramsIn "$out/opt" "''${pythonPath[*]}"
   '';
 
   meta = {

From 8196cbb3ccf516f318dc08b1273e5e300600e214 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:35:22 +0100
Subject: [PATCH 36/40] tautulli: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/servers/tautulli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index 6bd614eaa089..8a60c8fa1acb 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -37,7 +37,7 @@ buildPythonApplication rec {
     # Can't just symlink to the main script, since it uses __file__ to
     # import bundled packages and manage the service
     makeWrapper $out/libexec/tautulli/Tautulli.py $out/bin/tautulli
-    wrapPythonProgramsIn "$out/libexec/tautulli" "$pythonPath"
+    wrapPythonProgramsIn "$out/libexec/tautulli" "''${pythonPath[*]}"
 
     # Creat backwards compatibility symlink to bin/plexpy
     ln -s $out/bin/tautulli $out/bin/plexpy

From 2535d55abc5e32888252dc221a637dd3a634a8c0 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:37:20 +0100
Subject: [PATCH 37/40] inkscape-extensions.silhouette: expand pythonPath bash
 array for structuredAttrs

---
 .../graphics/inkscape/extensions/silhouette/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
index 663a8b14c8de..b440af5f92e0 100644
--- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
@@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out ''${pythonPath[*]}"
   '';
 
   meta = {

From 9efbf9055436332dd328957fef8ae5787cfb7ba6 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 23 Jan 2026 14:37:33 +0100
Subject: [PATCH 38/40] inkscape-extensions.textext: expand pythonPath bash
 array for structuredAttrs

---
 .../graphics/inkscape/extensions/textext/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix
index aada64492ece..e11e744e393b 100644
--- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix
@@ -113,7 +113,7 @@ python3.pkgs.buildPythonApplication rec {
 
   postFixup = ''
     # Wrap the project so it can find runtime dependencies.
-    wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out ''${pythonPath[*]}"
     cp ${launchScript} $out/share/inkscape/extensions/textext/launch.sh
   '';
 

From 20828ad4f57a032c22afe3e378408ec717965a77 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 26 Jan 2026 09:04:42 +0100
Subject: [PATCH 39/40] cgit: expand pythonPath bash array for structuredAttrs

---
 pkgs/applications/version-management/cgit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/cgit/default.nix b/pkgs/applications/version-management/cgit/default.nix
index 06b801a9dcbf..4ff7ca269e82 100644
--- a/pkgs/applications/version-management/cgit/default.nix
+++ b/pkgs/applications/version-management/cgit/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
     mkdir -p "$out/share/man/man5"
     cp cgitrc.5 "$out/share/man/man5"
 
-    wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/lib/cgit/filters" "$out ''${pythonPath[*]}"
 
     for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
       wrapProgram $script --prefix PATH : '${

From 9b8cbc9cf66a6ec8cb3a08805e59d9d8b7883b32 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 27 Jan 2026 11:55:05 +0100
Subject: [PATCH 40/40] maubot: expand pythonPath bash array for
 structuredAttrs

---
 pkgs/development/python-modules/maubot/wrapper.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/maubot/wrapper.nix b/pkgs/development/python-modules/maubot/wrapper.nix
index db2823e17eaa..c41d485d53ce 100644
--- a/pkgs/development/python-modules/maubot/wrapper.nix
+++ b/pkgs/development/python-modules/maubot/wrapper.nix
@@ -58,7 +58,9 @@ let
         mkdir -p $out/bin
         cp $unwrapped/bin/.mbc-wrapped $out/bin/mbc
         cp $unwrapped/bin/.maubot-wrapped $out/bin/maubot
-        wrapPythonProgramsIn "$out/bin" "${lib.optionalString (baseConfig != null) "$out "}$pythonPath"
+        wrapPythonProgramsIn "$out/bin" "${
+          lib.optionalString (baseConfig != null) "$out "
+        }''${pythonPath[*]}"
       '';
 
       passthru = {