diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-07 13:40:39 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-07 13:40:39 -0700 |
| commit | 4624985561321d04aede0163c326a2c3d4c38d30 (patch) | |
| tree | 391d62e16f20e4d9679de3a64792e329824b3171 /pkgs/build-support | |
| parent | 793cbaedf40d5ef63a688a0328bdfb85986b0eef (diff) | |
| parent | 590e11bc534b90ce8de3eb27753761f2d5af1612 (diff) | |
| download | nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.gz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.bz2 nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.lz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.xz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.zst nixlib-4624985561321d04aede0163c326a2c3d4c38d30.zip | |
Merge branch 'master.upstream' into staging.upstream
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 be81e93e32ae..6fd630b13f4a 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 607a1b4a5ef6..5eaa995b4126 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 |