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

pyrox.dev / nixpkgs

fork atom

lol

fork atom

Fix pname to ename propagation if null

authored by

Thomas Tuegel and committed by

GitHub 7 years ago 3fd03165 1fe2a0f8

+6 -1

1 changed file

expand all

unified split

pkgs

build-support

emacs

melpa.nix

+6 -1

pkgs/build-support/emacs/melpa.nix

··· 13 /* 14 ename: Original Emacs package name, possibly containing special symbols. 15 */ 16 - , ename ? pname 17 , version 18 , recipe 19 , meta ? {} ··· 29 in 30 31 import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ 32 33 melpa = fetchFromGitHub { 34 owner = "melpa";

··· 13 /* 14 ename: Original Emacs package name, possibly containing special symbols. 15 */ 16 + , ename ? null 17 , version 18 , recipe 19 , meta ? {} ··· 29 in 30 31 import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ 32 + 33 + ename = 34 + if isNull(ename) 35 + then pname 36 + else ename; 37 38 melpa = fetchFromGitHub { 39 owner = "melpa";