straightBuild: simplify extra package definition

This commit is contained in:
László Vaskó
2020-01-25 21:28:05 +01:00
parent 8e95b5f888
commit d2f5dbb393

View File

@ -64,36 +64,24 @@ let
evil-escape = super.evil-escape.overrideAttrs (esuper: { evil-escape = super.evil-escape.overrideAttrs (esuper: {
patches = [ ./evil-escape.patch ]; patches = [ ./evil-escape.patch ];
}); });
evil-markdown = self.trivialBuild rec { straightBuild = { pname, ... }@args: self.trivialBuild ({
ename = pname;
version = "1";
src = lock.get pname;
buildPhase = ":";
} // args);
evil-markdown = self.straightBuild {
pname = "evil-markdown"; pname = "evil-markdown";
version = "1";
recipe = null;
ename = pname;
src = lock.get pname;
buildPhase = ":";
}; };
evil-org = self.trivialBuild rec { evil-org = self.straightBuild {
pname = "evil-org-mode"; pname = "evil-org-mode";
version = "1";
recipe = null;
ename = pname;
src = lock.get pname;
buildPhase = ":";
}; };
evil-quick-diff = self.trivialBuild rec { evil-quick-diff = self.straightBuild {
pname = "evil-quick-diff"; pname = "evil-quick-diff";
version = "1";
recipe = null;
ename = pname;
src = lock.get pname;
buildPhase = ":";
}; };
org-mode = self.trivialBuild rec { org-mode = self.straightBuild rec {
pname = "org-mode"; pname = "org-mode";
version = "9.4"; version = "9.4";
recipe = null;
ename = pname;
src = lock.get pname;
installPhase = '' installPhase = ''
LISPDIR=$out/share/emacs/site-lisp LISPDIR=$out/share/emacs/site-lisp
install -d $LISPDIR install -d $LISPDIR
@ -107,27 +95,15 @@ let
EOF EOF
''; '';
}; };
org-yt = self.trivialBuild rec { org-yt = self.straightBuild {
pname = "org-yt"; pname = "org-yt";
version = "1";
recipe = null;
ename = pname;
src = lock.get pname;
}; };
php-extras = self.trivialBuild rec { php-extras = self.straightBuild {
pname = "php-extras"; pname = "php-extras";
version = "1";
recipe = null;
ename = pname;
src = lock.get pname;
buildPhase = ":";
}; };
so-long = self.trivialBuild rec { so-long = self.straightBuild {
pname = "so-long"; pname = "so-long";
version = "1";
recipe = null;
ename = "emacs-so-long"; ename = "emacs-so-long";
src = lock.get pname;
}; };
}; };