1 files changed, 6 insertions, 32 deletions
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index 3cd5bbdb954a..99c755e2afcb 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -1,42 +1,16 @@
 (require 'package)
 (package-initialize)
 
+(require 'package-recipe)
 (require 'package-build)
 
-(setq package-build-working-dir (expand-file-name ".")
-      package-build-archive-dir (expand-file-name "."))
+(setq package-build-working-dir (expand-file-name "working/"))
+(setq package-build-archive-dir (expand-file-name "packages/"))
+(setq package-build-recipes-dir (expand-file-name "recipes/"))
 
 (defun melpa2nix-build-package ()
   (if (not noninteractive)
       (error "`melpa2nix-build-package' is to be used only with -batch"))
   (pcase command-line-args-left
-    (`(,package ,version . ,files)
-     (melpa2nix-package-build-archive package version files))))
-
-(defun melpa2nix-build-package-from-recipe ()
-  (if (not noninteractive)
-      (error "`melpa2nix-build-package' is to be used only with -batch"))
-  (pcase command-line-args-left
-    (`(,recipe-file ,version)
-     (let* ((recipe (package-build--read-from-file recipe-file))
-            (rcp (cdr recipe))
-            (package (car recipe))
-            (files (package-build--config-file-list rcp)))
-       (melpa2nix-package-build-archive package version files)))))
-
-(defun melpa2nix-package-build-archive (name version files)
-  "Build a package archive for package NAME."
-  (package-build--message "\n;;; %s\n" name)
-  (let* ((start-time (current-time))
-         (archive-entry (package-build-package name
-                                               version
-                                               files
-                                               package-build-working-dir
-                                               package-build-archive-dir))
-         (archive-file (package-build--archive-file-name archive-entry)))
-
-    (progn
-      (package-build--message "Built in %.3fs, finished at %s"
-                            (time-to-seconds (time-since start-time))
-                            (current-time-string))
-      (princ (format "%s\n" archive-file)))))
+    (`(,package ,version)
+     (package-build--package (package-recipe-lookup package) version))))