emacsPackages: don't set `preBuild` or `patches` to null (#452898) (7b1b81b8) · Commits · nix / nixpkgs

pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ in
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		preBuild =
		if applyOrgRoamMissingPatch then
		previousAttrs.preBuild or ""
		@@ -129,7 +129,7 @@ in
		popd
		''
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ rec {
		if predicate finalAttrs previousAttrs then
		previousAttrs.packageRequires or [ ] ++ packageRequires
		else
		previousAttrs.packageRequires or null;
		previousAttrs.packageRequires or [ ];
		}
		);

		@@ -89,7 +89,7 @@ rec {
		if predicate finalAttrs previousAttrs then
		previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ]
		else
		previousAttrs.nativeBuildInputs or null;
		previousAttrs.nativeBuildInputs or [ ];
		}
		);
		}

+8 −8

Original line number	Diff line number	Diff line
		@@ -830,7 +830,7 @@ let
		rm --recursive --verbose etc/elisp/screenshot
		''
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

		@@ -897,7 +897,7 @@ let
		rm --verbose --force test-bpr.el
		''
		else
		previousAttrs;
		previousAttrs.preBuild or "";
		}
		);

		@@ -991,7 +991,7 @@ let
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		}
		)
		);
		@@ -1055,7 +1055,7 @@ let
		''
		+ previousAttrs.preBuild or ""
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

		@@ -1221,7 +1221,7 @@ let
		rm --verbose packages/javascript/test-suppport.el
		''
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

		@@ -1392,7 +1392,7 @@ let
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		}
		);

		@@ -1543,7 +1543,7 @@ let
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		}
		);

		@@ -1561,7 +1561,7 @@ let
		''
		+ previousAttrs.preBuild or ""
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);