treewide: expand pythonPath bash array for structuredAttrs for wrapPythonProgramsIn (#483072)

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 = {

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
   '';
 

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 = {

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
   '';
 

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 = {

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 : '${

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
   '';

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 = {

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 = [

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 { };

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 = {

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 = {

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 \

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 = {

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"

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

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;

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")"

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 = {

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

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 = {

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 = {

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 = {

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"
   '';
 

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}
   '';

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" \

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 = {

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 = {

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 = {

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

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 = {

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 = {

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

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 = {

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 = {

pkgs/by-name/xe/xen/package.nix

@@ -329,7 +329,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 = ''

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 = {

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
     '';

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 = {

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