Fix the merge problem in fpkg
This commit is contained in:
parent
952c1dfef3
commit
c5bdda95ce
|
@ -125,10 +125,10 @@
|
|||
`(fg42-install-extension ,(eval pkgname))
|
||||
`(use-package ,(eval pkgname) ,@details)))
|
||||
|
||||
;; (defun depends-on (pkgname &rest args)
|
||||
;; "Install the package PKGNAME with respect to the ARGS."
|
||||
;; (let ((pkg (apply 'make-fpkg-dependency :name pkgname args)))
|
||||
;; (puthash pkgname pkg required-packages)))
|
||||
(defun depends-on (pkgname &rest args)
|
||||
"Install the package PKGNAME with respect to the ARGS."
|
||||
(let ((pkg (apply 'make-fpkg-dependency :name pkgname args)))
|
||||
(puthash pkgname pkg required-packages)))
|
||||
|
||||
|
||||
(provide 'fpkg)
|
||||
|
|
Loading…
Reference in New Issue