From 9dfd9fe0bffeadb1b1f0e6f56ec3245fe5a26097 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 16 Jan 2016 18:38:06 -0600 Subject: [PATCH] elpa2nix: fix packages with DOS line endings --- pkgs/build-support/emacs/elpa2nix.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/build-support/emacs/elpa2nix.el index 3a2d65d640f..7eef81b9e7a 100644 --- a/pkgs/build-support/emacs/elpa2nix.el +++ b/pkgs/build-support/emacs/elpa2nix.el @@ -21,7 +21,10 @@ (defun elpa2nix-install-file (file) "Install a package from a file. The file can either be a tar file or an Emacs Lisp file." - (with-temp-buffer - (insert-file-contents-literally file) - (when (string-match "\\.tar\\'" file) (tar-mode)) - (elpa2nix-install-from-buffer))) + (let ((is-tar (string-match "\\.tar\\'" file))) + (with-temp-buffer + (if is-tar + (insert-file-contents-literally file) + (insert-file-contents file)) + (when is-tar (tar-mode)) + (elpa2nix-install-from-buffer))))