various: fix makeWrapperArgs

2026-10-31 01:02:20 +00:00 · 2026-10-04 14:22:23 -04:00
parent 894dcf755e
commit 9574dc64be
19 changed files with 140 additions and 77 deletions
--- 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
--- 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
--- 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 = {
--- 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
--- 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}";
--- 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 = ''
--- 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 = {
--- 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 \
--- 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 = ''
--- 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 = {
--- 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" ];

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