public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44060 from periklis/emacs-package-eval-fix 

Fix pname to ename propagation if null
This commit is contained in:
Thomas Tuegel 2018-07-27 05:11:03 -05:00 committed by GitHub
parent 1fe2a0f81e 04f0c25222
commit 3fd03165aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/emacs/melpa.nix
View File

@ -13,7 +13,7 @@ with lib;
/* /*
ename: Original Emacs package name, possibly containing special symbols. ename: Original Emacs package name, possibly containing special symbols.
*/ */
, ename ? pname , ename ? null
, version , version
, recipe , recipe
, meta ? {} , meta ? {}
@ -30,6 +30,11 @@ in
import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
ename =
if isNull(ename)
then pname
else ename;
melpa = fetchFromGitHub { melpa = fetchFromGitHub {
owner = "melpa"; owner = "melpa";
repo = "melpa"; repo = "melpa";