applyPatches: unconditionally set attrsets that are always set regardless

2026-02-12 13:25:13 -05:00
parent e8816d69ff
commit 354aab19f9
1 changed files with 5 additions and 7 deletions
@@ -1077,14 +1077,12 @@ rec {
        doDist = false;

        installPhase = "cp -R ./ $out";
-      }
-      # Carry (and merge) information from the underlying `src` if present.
-      // (optionalAttrs (src ? meta) {
-        meta = removeAttrs src.meta [ "position" ];
-      })
-      // (optionalAttrs (extraPassthru != { } || src ? passthru) {
+
        passthru = extraPassthru // src.passthru or { };
-      });
+
+        # Carry (and merge) information from the underlying `src` if present.
+        meta = lib.optionalAttrs (src ? meta) (removeAttrs src.meta) [ "position" ];
+      };
  };

  # TODO: move docs to Nixpkgs manual