aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSharlatan Hellseher <sharlatanus@gmail.com>2025-05-18 20:32:37 +0100
committerSharlatan Hellseher <sharlatanus@gmail.com>2025-05-18 20:42:48 +0100
commit475e8802c3d2c67c84cedfda4e66b6b59d8a9e36 (patch)
tree1d4e8152a40129f4dd7c47bce85c29c683ee1c21
parent91a81927345394c9f52bca6ecf743f48cd24d250 (diff)
downloadguix-475e8802c3d2c67c84cedfda4e66b6b59d8a9e36.tar.gz
guix-475e8802c3d2c67c84cedfda4e66b6b59d8a9e36.zip
gnu: rlottie-for-telegram-desktop: Do not inherit.
When trying to inherit from the package which is no available in the current module `make' may fail with issue to find the package, this change convert the rlottie-for-telegram-desktop variant into independent one. * gnu/packages/telegram.scm (rlottie-for-telegram-desktop): Convert to independate package. [name]: Add it. [arguments]: Copy from rlottie. [native-inputs]: Likewise. [description]: Add meaniglfull description of the package variant. [license]: List mentioned in the project. Change-Id: I5fd7209f9e03fe8071a8c55e413664745f85a2a8
-rw-r--r--gnu/packages/telegram.scm39
1 files changed, 30 insertions, 9 deletions
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 65d95711b9..98104a5850 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2024 dan <i@dan.games>
+;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -80,6 +81,7 @@
#:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system qt))
@@ -370,25 +372,44 @@ Telegram project, for its use in telegram desktop client.")
(revision "678"))
(hidden-package
(package
- (inherit rlottie)
- (version
- (git-version "0.0.1" revision commit))
+ (name "rlottie-for-telegram-desktop")
+ (version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/desktop-app/rlottie.git")
- (commit commit)))
+ (uri (git-reference
+ (url "https://github.com/desktop-app/rlottie.git")
+ (commit commit)))
(file-name
- (git-file-name "rlottie-for-telegram-desktop" version))
+ (git-file-name name version))
(sha256
(base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i"))
(modules '((guix build utils)))
(snippet
#~(begin
(substitute* "meson.build"
- (("werror=true") "werror=false"))))))))))
+ (("werror=true") "werror=false"))))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:configure-flags #~(list
+ "-Dlog=true"
+ "-Dtest=true"
+ "-Dcpp_std=gnu++17")))
+ (native-inputs
+ (list googletest
+ pkg-config))
+ (synopsis "Rlottie for Telegram desktop")
+ (home-page "https://github.com/desktop-app/rlottie")
+ (description
+ "This package is an alternative fork of
+https://github.com/Samsung/rlottie with changes adopted for Telegram desktop
+and not propagated to upstream.")
+ ;; All Licenses are listed in README and provided in licenses
+ ;; directory.
+ (license (list license:bsd-3
+ license:expat
+ license:freetype
+ license:lgpl2.1+))))))
(define cld3-for-telegram-desktop
(origin