diff options
Diffstat (limited to 'pkgs/build-support/emacs/melpa2nix.el')
-rw-r--r-- | pkgs/build-support/emacs/melpa2nix.el | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index 3de77dbf5e5c6..72667dea652c1 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -11,22 +11,22 @@ ;; Allow installing package tarfiles larger than 10MB (setq large-file-warning-threshold nil) -(defun melpa2nix-build-package-1 (rcp) - (let* ((default-directory (package-recipe--working-tree rcp))) +(defun melpa2nix-build-package-1 (rcp version commit) + (let ((source-dir (package-recipe--working-tree rcp))) (unwind-protect (let ((files (package-build-expand-files-spec rcp t))) - (unless files - (error "Unable to find files matching recipe patterns")) - (if (> (length files) 1) - (package-build--build-multi-file-package rcp files) - (package-build--build-single-file-package rcp files)))))) + (cond + ((= (length files) 1) + (package-build--build-single-file-package + rcp version commit files source-dir)) + ((> (length files) 1) + (package-build--build-multi-file-package + rcp version commit files source-dir)) + (t (error "Unable to find files matching recipe patterns"))))))) (defun melpa2nix-build-package () - (unless noninteractive - (error "`melpa2nix-build-package' is to be used only with -batch")) + (if (not noninteractive) + (error "`melpa2nix-build-package' is to be used only with -batch")) (pcase command-line-args-left (`(,package ,version ,commit) - (let ((recipe (package-recipe-lookup package))) - (setf (oref recipe commit) commit) - (setf (oref recipe version) version) - (melpa2nix-build-package-1 recipe))))) + (melpa2nix-build-package-1 (package-recipe-lookup package) version commit)))) |