mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-13 12:38:32 +00:00
melpa-packages: remove condition about null in helper functions (#341923)
This commit is contained in:
commit
3d3f243552
@ -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
|
||||
}:
|
||||
|
Loading…
Reference in New Issue
Block a user