From 04f0c2522294c75e298ed756ffa8ad14e841d4e6 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Tue, 24 Jul 2018 20:31:21 +0200
Subject: [PATCH] Fix pname to ename propagation if null

---
 pkgs/build-support/emacs/melpa.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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