diff --git a/nix/package/default.nix b/nix/package/default.nix
index fc987eca7..ecc154b8c 100644
--- a/nix/package/default.nix
+++ b/nix/package/default.nix
@@ -24,6 +24,8 @@ python3Packages.buildPythonApplication {
   inherit (pyproject) version;
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = ../../.;
 
   nativeBuildInputs = [
@@ -83,21 +85,26 @@ python3Packages.buildPythonApplication {
   dontWrapGApps = true;
   dontWrapQtApps = true;
   makeWrapperArgs = [
-    "--suffix PATH : ${
-      lib.makeBinPath [
-        ffmpeg-headless
-        ripgrep
-      ]
-    }"
+    "--suffix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      ffmpeg-headless
+      ripgrep
+    ])
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${
-    lib.makeLibraryPath [ pipewire ]
-  }"
-  ++ [
-    "\${gappsWrapperArgs[@]}"
-    "\${qtWrapperArgs[@]}"
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "--suffix"
+    "LD_LIBRARY_PATH"
+    ":"
+    (lib.makeLibraryPath [ pipewire ])
   ];
 
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
   pythonRemoveDeps = lib.optional (!withJXLSupport) "pillow_jxl";
   pythonRelaxDeps = [
     "numpy"