diff options
author | Jan Malakhovski <oxij@oxij.org> | 2015-05-24 14:06:12 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2015-07-31 02:02:04 +0000 |
commit | 56fbeb7a93ccec533316a685e2495d4178d3ae6c (patch) | |
tree | 60af28cd0c974da91795222277b81082d618dc69 /pkgs/build-support | |
parent | 389a0bf6cc0ca99cff3376648599285ec817b0b3 (diff) | |
download | nixpkgs-56fbeb7a93ccec533316a685e2495d4178d3ae6c.tar nixpkgs-56fbeb7a93ccec533316a685e2495d4178d3ae6c.tar.gz nixpkgs-56fbeb7a93ccec533316a685e2495d4178d3ae6c.tar.bz2 nixpkgs-56fbeb7a93ccec533316a685e2495d4178d3ae6c.tar.lz nixpkgs-56fbeb7a93ccec533316a685e2495d4178d3ae6c.tar.xz nixpkgs-56fbeb7a93ccec533316a685e2495d4178d3ae6c.tar.zst nixpkgs-56fbeb7a93ccec533316a685e2495d4178d3ae6c.zip |
emacs-packages: add automatic meta.homepages to builders, cleanup other expressions
Because we can.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/emacs/generic.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/emacs/melpa.nix | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index be81e93e32a..6fd630b13f4 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -16,10 +16,14 @@ with lib; }@args: let + defaultMeta = { broken = false; platforms = emacs.meta.platforms; + } // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; }; + in stdenv.mkDerivation ({ diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 607a1b4a5ef..5eaa995b412 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -31,7 +31,7 @@ let targets = concatStringsSep " " (if files == null then fileSpecs else files); defaultMeta = { - homepage = "http://melpa.org/#/${pname}"; + homepage = args.src.meta.homepage or "http://melpa.org/#/${pname}"; }; in |