melpa-packages: remove condition about null in helper functions (#341923)

This commit is contained in:
Lin Jian 2024-09-15 10:29:29 +08:00 committed by GitHub
commit 3d3f243552
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -31,36 +31,34 @@ in
{ lib, pkgs }: variant: self:
let
dontConfigure = pkg:
if pkg != null then pkg.override (args: {
pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
dontConfigure = true;
});
}) else null;
});
markBroken = pkg:
if pkg != null then pkg.override (args: {
pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
meta = (drv.meta or { }) // { broken = true; };
});
}) else null;
});
externalSrc = pkg: epkg:
if pkg != null then pkg.override (args: {
pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
inherit (epkg) src version;
propagatedUserEnvPkgs = [ epkg ];
});
}) else null;
});
buildWithGit = pkg: pkg.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
});
fix-rtags = pkg:
if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags)
else null;
fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags);
generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive
}: