diff options
| author | Andrew Tropin <andrew@trop.in> | 2022-01-20 14:09:14 +0300 |
|---|---|---|
| committer | Andrew Tropin <andrew@trop.in> | 2022-11-28 09:44:00 +0400 |
| commit | 6cba399c04044bcd74619b79d8de5134d05815e9 (patch) | |
| tree | 1947230591be8809dbdab05d4fa0630666171c99 | |
| parent | 6fe253da9bcb728c1927207cb04fa324fbfd99aa (diff) | |
gnu: telega: Use new package style.
* gnu/packages/emacs-xyz.scm (emacs-telega, emacs-telega-contrib): Use gexps,
remove trailing #t.
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 82 |
1 files changed, 42 insertions, 40 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f4568daee41..9013e37a54d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm | |||
| @@ -30403,39 +30403,40 @@ service, and connect it with Emacs via inter-process communication.") | |||
| 30403 | (name "emacs-telega") | 30403 | (name "emacs-telega") |
| 30404 | (build-system emacs-build-system) | 30404 | (build-system emacs-build-system) |
| 30405 | (arguments | 30405 | (arguments |
| 30406 | `(#:emacs ,(if (target-64bit?) | 30406 | (list |
| 30407 | emacs-minimal | 30407 | #:emacs (if (target-64bit?) |
| 30408 | ;; Require wide-int support for 32-bit platform. | 30408 | emacs-minimal |
| 30409 | emacs-wide-int) | 30409 | ;; Require wide-int support for 32-bit platform. |
| 30410 | #:include (cons "^etc\\/" %default-include) | 30410 | emacs-wide-int) |
| 30411 | #:phases | 30411 | #:include #~(cons "^etc\\/" %default-include) |
| 30412 | (modify-phases %standard-phases | 30412 | #:phases |
| 30413 | (add-after 'unpack 'patch-sources | 30413 | #~(modify-phases %standard-phases |
| 30414 | (lambda* (#:key inputs #:allow-other-keys) | 30414 | (add-after 'unpack 'patch-sources |
| 30415 | ;; Hard-code paths to `ffplay` and `ffmpeg`. | 30415 | (lambda* (#:key inputs #:allow-other-keys) |
| 30416 | (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay")) | 30416 | ;; Hard-code paths to `ffplay` and `ffmpeg`. |
| 30417 | (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg"))) | 30417 | (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay")) |
| 30418 | (substitute* '("telega-ffplay.el" "telega-vvnote.el") | 30418 | (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg"))) |
| 30419 | (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" | 30419 | (substitute* '("telega-ffplay.el" "telega-vvnote.el") |
| 30420 | all func cmd) | 30420 | (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" |
| 30421 | (string-append func " \"" | 30421 | all func cmd) |
| 30422 | (search-input-file | 30422 | (string-append func " \"" |
| 30423 | inputs (string-append "/bin/" cmd)))) | 30423 | (search-input-file |
| 30424 | (("\\(executable-find \"ffplay\"\\)") | 30424 | inputs (string-append "/bin/" cmd)))) |
| 30425 | (string-append "(and (file-executable-p \"" ffplay-bin "\")" | 30425 | (("\\(executable-find \"ffplay\"\\)") |
| 30426 | "\"" ffplay-bin "\")")) | 30426 | (string-append "(and (file-executable-p \"" ffplay-bin "\")" |
| 30427 | (("\\(executable-find \"ffmpeg\"\\)") | 30427 | "\"" ffplay-bin "\")")) |
| 30428 | (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" | 30428 | (("\\(executable-find \"ffmpeg\"\\)") |
| 30429 | "\"" ffmpeg-bin "\")")))))) | 30429 | (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" |
| 30430 | (add-after 'unpack 'configure | 30430 | "\"" ffmpeg-bin "\")")))))) |
| 30431 | (lambda* (#:key inputs outputs #:allow-other-keys) | 30431 | (add-after 'unpack 'configure |
| 30432 | (substitute* "telega-customize.el" | 30432 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 30433 | (("@TELEGA_SERVER_BIN@") | 30433 | (substitute* "telega-customize.el" |
| 30434 | (search-input-file inputs "/bin/telega-server"))) | 30434 | (("@TELEGA_SERVER_BIN@") |
| 30435 | (substitute* "telega-util.el" | 30435 | (search-input-file inputs "/bin/telega-server"))) |
| 30436 | (("@TELEGA_SHARE@") | 30436 | (substitute* "telega-util.el" |
| 30437 | (string-append (elpa-directory (assoc-ref outputs "out")) | 30437 | (("@TELEGA_SHARE@") |
| 30438 | "/etc")))))))) | 30438 | (string-append (elpa-directory (assoc-ref outputs "out")) |
| 30439 | "/etc")))))))) | ||
| 30439 | (inputs | 30440 | (inputs |
| 30440 | (list emacs-telega-server ffmpeg)) | 30441 | (list emacs-telega-server ffmpeg)) |
| 30441 | (native-inputs '()) | 30442 | (native-inputs '()) |
| @@ -30451,13 +30452,14 @@ for the Telegram messaging platform."))) | |||
| 30451 | (inherit emacs-telega) | 30452 | (inherit emacs-telega) |
| 30452 | (name "emacs-telega-contrib") | 30453 | (name "emacs-telega-contrib") |
| 30453 | (arguments | 30454 | (arguments |
| 30454 | `(#:exclude '("telega-live-location.el") | 30455 | (list |
| 30455 | #:phases | 30456 | #:exclude #~(list "telega-live-location.el") |
| 30456 | (modify-phases %standard-phases | 30457 | #:phases |
| 30457 | (add-after 'unpack 'enter-subdirectory | 30458 | #~(modify-phases %standard-phases |
| 30458 | (lambda _ (chdir "contrib") #t)) | 30459 | (add-after 'unpack 'enter-subdirectory |
| 30459 | (add-before 'install-license-files 'leave-subdirectory | 30460 | (lambda _ (chdir "contrib"))) |
| 30460 | (lambda _ (chdir "..") #t))))) | 30461 | (add-before 'install-license-files 'leave-subdirectory |
| 30462 | (lambda _ (chdir "..")))))) | ||
| 30461 | (inputs '()) | 30463 | (inputs '()) |
| 30462 | (native-inputs '()) | 30464 | (native-inputs '()) |
| 30463 | (propagated-inputs | 30465 | (propagated-inputs |
