diff --git a/pkgs/by-name/ra/radian/package.nix b/pkgs/by-name/ra/radian/package.nix
index 3c33212371f0..6f7e0a4e7bcd 100644
--- a/pkgs/by-name/ra/radian/package.nix
+++ b/pkgs/by-name/ra/radian/package.nix
@@ -54,7 +54,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
       writableTmpDirAsHomeHook
     ];
 
-  makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ];
+  makeWrapperArgs = [
+    "--set"
+    "R_HOME"
+    "${R}/lib/R"
+  ];
 
   preCheck = ''
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib
diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix
index 5d0670de5a1c..249e6bbfa624 100644
--- a/pkgs/by-name/sc/scdl/package.nix
+++ b/pkgs/by-name/sc/scdl/package.nix
@@ -33,7 +33,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
       packagesToBinPath = [ ffmpeg-headless ];
     in
     [
-      ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"''
+      "--prefix"
+      "PATH"
+      ":"
+      (lib.makeBinPath packagesToBinPath)
     ];
 
   # No tests in repository
diff --git a/pkgs/by-name/si/sigal/package.nix b/pkgs/by-name/si/sigal/package.nix
index e47435629112..ebb9145ae885 100644
--- a/pkgs/by-name/si/sigal/package.nix
+++ b/pkgs/by-name/si/sigal/package.nix
@@ -48,7 +48,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ ffmpeg ])
   ];
 
   meta = {
diff --git a/pkgs/by-name/so/social-engineer-toolkit/package.nix b/pkgs/by-name/so/social-engineer-toolkit/package.nix
index 0275b0ed59ef..4df44ad15401 100644
--- a/pkgs/by-name/so/social-engineer-toolkit/package.nix
+++ b/pkgs/by-name/so/social-engineer-toolkit/package.nix
@@ -54,8 +54,12 @@ python3Packages.buildPythonApplication rec {
   '';
 
   makeWrapperArgs = [
-    "--chdir ${placeholder "out"}/share/social-engineer-toolkit"
-    "--prefix PYTHONPATH : \"${placeholder "out"}/share/social-engineer-toolkit\""
+    "--chdir"
+    "${placeholder "out"}/share/social-engineer-toolkit"
+    "--prefix"
+    "PYTHONPATH"
+    ":"
+    "${placeholder "out"}/share/social-engineer-toolkit"
   ];
 
   # Project has no tests
diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix
index c1de94ac7194..2a4af3a104c0 100644
--- a/pkgs/by-name/st/streamdeck-ui/package.nix
+++ b/pkgs/by-name/st/streamdeck-ui/package.nix
@@ -117,10 +117,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   dontWrapQtApps = true;
   dontWrapGApps = true;
-  makeWrapperArgs = [
-    "\${qtWrapperArgs[@]}"
-    "\${gappsWrapperArgs[@]}"
-  ];
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${qtWrapperArgs[@]}"
+      "''${gappsWrapperArgs[@]}"
+    )
+  '';
 
   meta = {
     changelog = "https://github.com/streamdeck-linux-gui/streamdeck-linux-gui/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index 8c1f1a2316e1..25002c591a8d 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -139,20 +139,29 @@ python3Packages.buildPythonApplication {
     ++ lib.optional stdenv.hostPlatform.isLinux pulsectl;
 
   makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}"
-    "--prefix LD_LIBRARY_PATH : ${
-      lib.makeLibraryPath (
-        [
-          game-music-emu
-          libayatana-appindicator
-          libopenmpt
-          pulseaudio
-        ]
-        ++ lib.optional stdenv.hostPlatform.isLinux libxcursor
-      )
-    }"
-    "--prefix PYTHONPATH : $out/share/tauon"
-    "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ ffmpeg ])
+    "--prefix"
+    "LD_LIBRARY_PATH"
+    ":"
+    (lib.makeLibraryPath (
+      [
+        game-music-emu
+        libayatana-appindicator
+        libopenmpt
+        pulseaudio
+      ]
+      ++ lib.optional stdenv.hostPlatform.isLinux libxcursor
+    ))
+    "--prefix"
+    "PYTHONPATH"
+    ":"
+    "$out/share/tauon"
+    "--set"
+    "GI_TYPELIB_PATH"
+    "$GI_TYPELIB_PATH"
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/ti/tiddit/package.nix b/pkgs/by-name/ti/tiddit/package.nix
index 5bb402ec8d61..0d130d9384c7 100644
--- a/pkgs/by-name/ti/tiddit/package.nix
+++ b/pkgs/by-name/ti/tiddit/package.nix
@@ -31,14 +31,17 @@ python3Packages.buildPythonApplication (finalAttrs: {
   ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${
-      lib.makeBinPath [
-        bwa
-        fermi2
-        ropebwt2
-      ]
-    }"
-    "--set PYTHONPATH $PYTHONPATH"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      bwa
+      fermi2
+      ropebwt2
+    ])
+    "--set"
+    "PYTHONPATH"
+    "$PYTHONPATH"
   ];
 
   meta = {
diff --git a/pkgs/by-name/tl/tlp-pd/package.nix b/pkgs/by-name/tl/tlp-pd/package.nix
index 70ce050802d8..103f8ad5e3aa 100644
--- a/pkgs/by-name/tl/tlp-pd/package.nix
+++ b/pkgs/by-name/tl/tlp-pd/package.nix
@@ -27,7 +27,12 @@ python3Packages.buildPythonApplication {
     "install-man-pd"
   ];
 
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tlp ]}" ];
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ tlp ])
+  ];
 
   postInstall = ''
     substituteInPlace $out/share/dbus-1/system-services/*.service \
diff --git a/pkgs/by-name/to/tochd/package.nix b/pkgs/by-name/to/tochd/package.nix
index fb9529483f0e..a0e3466b5d39 100644
--- a/pkgs/by-name/to/tochd/package.nix
+++ b/pkgs/by-name/to/tochd/package.nix
@@ -23,12 +23,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
   ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${
-      lib.makeBinPath [
-        mame-tools
-        p7zip
-      ]
-    }"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      mame-tools
+      p7zip
+    ])
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix
index 59220f0bf27a..f8d596605527 100644
--- a/pkgs/by-name/tr/tremc/package.nix
+++ b/pkgs/by-name/tr/tremc/package.nix
@@ -37,9 +37,12 @@ python3Packages.buildPythonApplication {
   makeFlags = [ "DESTDIR=${placeholder "out"}" ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${
-      lib.makeBinPath (lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy)
-    }"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath (
+      lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy
+    ))
   ];
 
   meta = {
diff --git a/pkgs/by-name/tw/twspace-dl/package.nix b/pkgs/by-name/tw/twspace-dl/package.nix
index 020af9671f57..4a63c0ec02a8 100644
--- a/pkgs/by-name/tw/twspace-dl/package.nix
+++ b/pkgs/by-name/tw/twspace-dl/package.nix
@@ -24,7 +24,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
     requests
   ];
 
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}" ];
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ ffmpeg-headless ])
+  ];
 
   pythonImportsCheck = [ "twspace_dl" ];
 
diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix
index 316bed2e2f09..0642f2190d70 100644
--- a/pkgs/by-name/un/unblob/package.nix
+++ b/pkgs/by-name/un/unblob/package.nix
@@ -105,7 +105,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pythonImportsCheck = [ "unblob" ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath runtimeDeps}"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath runtimeDeps)
   ];
 
   nativeCheckInputs =
diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix
index 94b9364d1515..409ee04fb12a 100644
--- a/pkgs/by-name/un/unsilence/package.nix
+++ b/pkgs/by-name/un/unsilence/package.nix
@@ -25,7 +25,10 @@ python3Packages.buildPythonPackage rec {
   ];
 
   makeWrapperArgs = [
-    "--suffix PATH : ${lib.makeBinPath [ ffmpeg ]}"
+    "--suffix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ ffmpeg ])
   ];
 
   doCheck = false;
diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix
index 77e9a7db65d5..85ad6b340443 100644
--- a/pkgs/by-name/vc/vcsi/package.nix
+++ b/pkgs/by-name/vc/vcsi/package.nix
@@ -37,7 +37,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   pythonImportsCheck = [ "vcsi" ];
 
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ];
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ ffmpeg ])
+  ];
 
   nativeCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/vi/vidcutter/package.nix b/pkgs/by-name/vi/vidcutter/package.nix
index f35658fb5e2d..23db12d7fe6b 100644
--- a/pkgs/by-name/vi/vidcutter/package.nix
+++ b/pkgs/by-name/vi/vidcutter/package.nix
@@ -41,15 +41,17 @@ python3Packages.buildPythonApplication {
   ];
 
   dontWrapQtApps = true;
-  makeWrapperArgs = [
-    "\${qtWrapperArgs[@]}"
-    "--prefix PATH : ${
-      lib.makeBinPath [
-        ffmpeg
-        mediainfo
-      ]
-    }"
-  ];
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${qtWrapperArgs[@]}"
+      "--prefix" "PATH" ":" "${
+        lib.makeBinPath [
+          ffmpeg
+          mediainfo
+        ]
+      }"
+    )
+  '';
 
   meta = {
     description = "Modern yet simple multi-platform video cutter and joiner";
diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 33eeb4bc76b7..f13d1d12ded1 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -100,18 +100,20 @@ python3Packages.buildPythonApplication {
 
   dontWrapGApps = true;
 
-  makeWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
-    "--prefix PATH : ${
-      lib.makeBinPath [
-        android-tools
-        bindfs
-        e2fsprogs
-        fakeroot
-        unzip
-      ]
-    }"
-  ];
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      "--prefix" "PATH" ":" "${
+        lib.makeBinPath [
+          android-tools
+          bindfs
+          e2fsprogs
+          fakeroot
+          unzip
+        ]
+      }"
+    )
+  '';
 
   postInstallCheck = ''
     mesonCheckPhase
diff --git a/pkgs/by-name/wh/whipper/package.nix b/pkgs/by-name/wh/whipper/package.nix
index 3f60058a23cf..3be265b22e1e 100644
--- a/pkgs/by-name/wh/whipper/package.nix
+++ b/pkgs/by-name/wh/whipper/package.nix
@@ -82,14 +82,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     ]
     ++ bins;
 
-  makeWrapperArgs = [
-    "--prefix"
-    "PATH"
-    ":"
-    (lib.makeBinPath bins)
-    "\${gappsWrapperArgs[@]}"
-  ];
-
   dontWrapGApps = true;
 
   outputs = [
@@ -112,6 +104,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     installManPage man/*.1
   '';
 
+  preFixup = ''
+    makeWrapperArgs+=(
+      "--prefix" "PATH" ":" "${lib.makeBinPath bins}"
+      "''${gappsWrapperArgs[@]}"
+    )
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = whipper;
     command = "HOME=$TMPDIR whipper --version";
diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index aa0a280ea8c6..f7efdbd05a4f 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -39,8 +39,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
   ];
 
   makeWrapperArgs = [
-    "--set YTDL_SUB_FFMPEG_PATH ${lib.getExe' ffmpeg_7 "ffmpeg"}"
-    "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg_7 "ffprobe"}"
+    "--set"
+    "YTDL_SUB_FFMPEG_PATH"
+    (lib.getExe' ffmpeg_7 "ffmpeg")
+    "--set"
+    "YTDL_SUB_FFPROBE_PATH"
+    (lib.getExe' ffmpeg_7 "ffprobe")
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/servers/web-apps/szurubooru/server.nix b/pkgs/servers/web-apps/szurubooru/server.nix
index 9eee0883c0f9..bfa2bd2397a8 100644
--- a/pkgs/servers/web-apps/szurubooru/server.nix
+++ b/pkgs/servers/web-apps/szurubooru/server.nix
@@ -33,7 +33,10 @@ python3.pkgs.buildPythonApplication {
   ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ ffmpeg-full ])
   ];
 
   postInstall = ''