diff mbox series

[bug#57675,v4,02/10] gnu: telegram-desktop: Simplify inputs.

Message ID y76bkrbrj0j.wl-hako@ultrarare.space
State New
Headers show
Series gnu: telegram-desktop: Update to 4.2.0. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Hilton Chain Sept. 19, 2022, 6:11 a.m. UTC
* gnu/packages/telegram.scm (telegram-desktop)[source,#:phases]: Remove
unneeded #t.
[native-inputs,inputs]: Simplify inputs.
---
 gnu/packages/telegram.scm | 468 +++++++++++++++++++-------------------
 1 file changed, 232 insertions(+), 236 deletions(-)

--
2.37.3
diff mbox series

Patch

diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 3a46ab086c..cd25897634 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -293,8 +293,7 @@  (define-public telegram-desktop
                (for-each delete-file-recursively
                          (lset-difference string=?
                                           (scandir ".")
-                                          (cons* "." ".." keep))))
-             #t)))))
+                                          (cons* "." ".." keep)))))))))
     (build-system qt-build-system)
     (arguments
      `(#:tests? #f                      ; No target
@@ -323,8 +322,7 @@  (define-public telegram-desktop
        (modify-phases %standard-phases
          (add-after 'unpack 'make-writable
            (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t))
+             (for-each make-file-writable (find-files "."))))
          (add-after 'make-writable 'copy-inputs
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (for-each
@@ -351,246 +349,244 @@  (define-public telegram-desktop
                 ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source"))
                 ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source"))
                 ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source"))
-                ("Telegram/ThirdParty/tgcalls"
-                 ,(assoc-ref inputs "tgcalls-source"))))
-             #t))
+                ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source"))))))
          (add-before 'configure 'patch-cxx-flags
            (lambda _
-             (substitute* "cmake/options_linux.cmake"
-               (("class-memaccess") "all"))
-             #t))
+             (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all"))))
          (add-after 'install 'glib-or-gtk-compile-schemas
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
          (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (native-inputs
-     `(("cmake-helpers"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/cmake_helpers.git")
-             (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72")))
-           (file-name
-            (git-file-name "cmake-helpers-for-telegram-desktop" version))
-           (sha256
-            (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))
-       ("cmake-shared" ,cmake-shared)
-       ("extra-cmake-modules" ,extra-cmake-modules)
-       ("glib:bin" ,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
-       ("gtk+:bin" ,gtk+ "bin")
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)
-       ("qttools-5" ,qttools-5)))
+     (modify-inputs
+         `(("cmake-helpers"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/cmake_helpers.git")
+                 (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72")))
+               (file-name
+                (git-file-name
+                 "cmake-helpers-for-telegram-desktop" version))
+               (sha256
+                (base32
+                 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))))
+       (append cmake-shared
+               extra-cmake-modules
+               `(,glib "bin")
+               `(,gtk+ "bin")
+               pkg-config
+               python-wrapper
+               qttools-5)))
     (inputs
-     `(("alsa" ,alsa-lib)
-       ("c++-gsl" ,c++-gsl)
-       ("catch" ,catch2)
-       ("codegen-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/codegen.git")
-             (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119")))
-           (file-name
-            (git-file-name "codegen" version))
-           (sha256
-            (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))
-       ("expected" ,libexpected)
-       ("fcitx-qt5" ,fcitx-qt5)
-       ("fcitx5-qt" ,fcitx5-qt)
-       ("ffmpeg" ,ffmpeg)
-       ("glib" ,glib)
-       ("glibmm" ,glibmm-2.64)
-       ("gtk+" ,gtk+)
-       ("hime" ,hime)
-       ("hunspell" ,hunspell)
-       ("jemalloc" ,jemalloc)
-       ("kwayland" ,kwayland)
-       ("lib-base-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_base.git")
-             (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6")))
-           (file-name
-            (git-file-name "lib-base-for-telegram-desktop" version))
-           (sha256
-            (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))
-       ("lib-crl-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_crl.git")
-             (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f")))
-           (file-name
-            (git-file-name "lib-crl-for-telegram-desktop" version))
-           (sha256
-            (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz"))))
-       ("lib-lottie-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_lottie.git")
-             (commit "0770df009db7928df1d0cad0900dc5110106d229")))
-           (file-name
-            (git-file-name "lib-lottie-for-telegram-desktop" version))
-           (sha256
-            (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))
-       ("lib-qr-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_qr.git")
-             (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189")))
-           (file-name
-            (git-file-name "lib-qr-for-telegram-desktop" version))
-           (sha256
-            (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))
-       ("lib-rlottie-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_rlottie.git")
-             (commit "0671bf70547381effcf442ec9618e04502a8adbc")))
-           (file-name
-            (git-file-name "lib-rlottie-for-telegram-desktop" version))
-           (sha256
-            (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))
-       ("lib-rpl-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_rpl.git")
-             (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617")))
-           (file-name
-            (git-file-name "lib-rpl-for-telegram-desktop" version))
-           (sha256
-            (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))
-       ("lib-spellcheck-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_spellcheck.git")
-             (commit "68c9b788958904aea7de79f986a0f82ec8c5b094")))
-           (file-name
-            (git-file-name "lib-spellcheck-for-telegram-desktop" version))
-           (sha256
-            (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))
-       ("lib-storage-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_storage.git")
-             (commit "403df6c4a29562bd417c92d410e49819f5a48cc1")))
-           (file-name
-            (git-file-name "lib-storage-for-telegram-desktop" version))
-           (sha256
-            (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))
-       ("lib-tl-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_tl.git")
-             (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb")))
-           (file-name
-            (git-file-name "lib-tl-for-telegram-desktop" version))
-           (sha256
-            (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))
-       ("lib-ui-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_ui.git")
-             (commit "1b590f9e16eb9571a039f072d6fea66c607e419f")))
-           (file-name
-            (git-file-name "lib-ui-for-telegram-desktop" version))
-           (sha256
-            (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))
-       ("lib-waylandshells-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_waylandshells.git")
-             (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7")))
-           (file-name
-            (git-file-name "lib-waylandshells-for-telegram-desktop" version))
-           (sha256
-            (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))
-       ("lib-webrtc-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_webrtc.git")
-             (commit "ef49f953f12b112008a094a719f40939aaf39db4")))
-           (file-name
-            (git-file-name "lib-webrtc-for-telegram-desktop" version))
-           (sha256
-            (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))
-       ("lib-webview-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/desktop-app/lib_webview.git")
-             (commit "e06427c624515485774e2e2181d4afeb05ad5a67")))
-           (file-name
-            (git-file-name "lib-webview-for-telegram-desktop" version))
-           (sha256
-            (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))
-       ("libdbusmenu-qt" ,libdbusmenu-qt)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libtgvoip" ,libtgvoip-for-telegram-desktop)
-       ("lz4" ,lz4)
-       ("materialdecoration" ,materialdecoration)
-       ("minizip" ,minizip)
-       ("nimf" ,nimf)
-       ("openal" ,openal)
-       ("openssl" ,openssl)
-       ("opus" ,opus)
-       ("pulseaudio" ,pulseaudio)
-       ("qrcodegen" ,qrcodegen-cpp)
-       ("qt" ,qtbase-5)
-       ("qtsvg-5" ,qtsvg-5)
-       ("qt5ct" ,qt5ct)
-       ("qtimageformats" ,qtimageformats)
-       ("qtwayland" ,qtwayland)
-       ("range-v3" ,range-v3)
-       ("rlottie" ,rlottie-for-telegram-desktop)
-       ("rnnoise" ,rnnoise)
-       ("tgcalls-source"
-        ,(origin
-           (method git-fetch)
-           (uri
-            (git-reference
-             (url "https://github.com/TelegramMessenger/tgcalls.git")
-             (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3")))
-           (file-name
-            (git-file-name "tgcalls-for-telegram-desktop" version))
-           (sha256
-            (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))
-       ("webrtc" ,webrtc-for-telegram-desktop)
-       ("x11" ,libx11)
-       ("xcb" ,libxcb)
-       ("xcb-keysyms" ,xcb-util-keysyms)
-       ("xxhash" ,xxhash)
-       ("zlib" ,zlib)))
-    (propagated-inputs
-     (list dconf))
+     (modify-inputs
+         `(("codegen-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/codegen.git")
+                 (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119")))
+               (file-name
+                (git-file-name "codegen" version))
+               (sha256
+                (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))
+           ("lib-base-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_base.git")
+                 (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6")))
+               (file-name
+                (git-file-name "lib-base-for-telegram-desktop" version))
+               (sha256
+                (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))
+           ("lib-crl-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_crl.git")
+                 (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f")))
+               (file-name
+                (git-file-name "lib-crl-for-telegram-desktop" version))
+               (sha256
+                (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz"))))
+           ("lib-lottie-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_lottie.git")
+                 (commit "0770df009db7928df1d0cad0900dc5110106d229")))
+               (file-name
+                (git-file-name "lib-lottie-for-telegram-desktop" version))
+               (sha256
+                (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))
+           ("lib-qr-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_qr.git")
+                 (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189")))
+               (file-name
+                (git-file-name "lib-qr-for-telegram-desktop" version))
+               (sha256
+                (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))
+           ("lib-rlottie-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_rlottie.git")
+                 (commit "0671bf70547381effcf442ec9618e04502a8adbc")))
+               (file-name
+                (git-file-name "lib-rlottie-for-telegram-desktop" version))
+               (sha256
+                (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))
+           ("lib-rpl-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_rpl.git")
+                 (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617")))
+               (file-name
+                (git-file-name "lib-rpl-for-telegram-desktop" version))
+               (sha256
+                (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))
+           ("lib-spellcheck-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_spellcheck.git")
+                 (commit "68c9b788958904aea7de79f986a0f82ec8c5b094")))
+               (file-name
+                (git-file-name "lib-spellcheck-for-telegram-desktop" version))
+               (sha256
+                (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))
+           ("lib-storage-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_storage.git")
+                 (commit "403df6c4a29562bd417c92d410e49819f5a48cc1")))
+               (file-name
+                (git-file-name "lib-storage-for-telegram-desktop" version))
+               (sha256
+                (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))
+           ("lib-tl-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_tl.git")
+                 (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb")))
+               (file-name
+                (git-file-name "lib-tl-for-telegram-desktop" version))
+               (sha256
+                (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))
+           ("lib-ui-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_ui.git")
+                 (commit "1b590f9e16eb9571a039f072d6fea66c607e419f")))
+               (file-name
+                (git-file-name "lib-ui-for-telegram-desktop" version))
+               (sha256
+                (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))
+           ("lib-waylandshells-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_waylandshells.git")
+                 (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7")))
+               (file-name
+                (git-file-name "lib-waylandshells-for-telegram-desktop" version))
+               (sha256
+                (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))
+           ("lib-webrtc-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_webrtc.git")
+                 (commit "ef49f953f12b112008a094a719f40939aaf39db4")))
+               (file-name
+                (git-file-name "lib-webrtc-for-telegram-desktop" version))
+               (sha256
+                (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))
+           ("lib-webview-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/desktop-app/lib_webview.git")
+                 (commit "e06427c624515485774e2e2181d4afeb05ad5a67")))
+               (file-name
+                (git-file-name "lib-webview-for-telegram-desktop" version))
+               (sha256
+                (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))
+           ("tgcalls-source"
+            ,(origin
+               (method git-fetch)
+               (uri
+                (git-reference
+                 (url "https://github.com/TelegramMessenger/tgcalls.git")
+                 (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3")))
+               (file-name
+                (git-file-name "tgcalls-for-telegram-desktop" version))
+               (sha256
+                (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))))
+       (append alsa-lib
+               c++-gsl
+               catch2
+               libexpected
+               fcitx-qt5
+               fcitx5-qt
+               ffmpeg
+               glib
+               glibmm-2.64
+               gtk+
+               hime
+               hunspell
+               jemalloc
+               kwayland
+               libdbusmenu-qt
+               libjpeg-turbo
+               libtgvoip-for-telegram-desktop
+               lz4
+               materialdecoration
+               minizip
+               nimf
+               openal
+               openssl
+               opus
+               pulseaudio
+               qrcodegen-cpp
+               qtbase-5
+               qtsvg-5
+               qt5ct
+               qtimageformats
+               qtwayland
+               range-v3
+               rlottie-for-telegram-desktop
+               rnnoise
+               webrtc-for-telegram-desktop
+               libx11
+               libxcb
+               xcb-util-keysyms
+               xxhash
+               zlib)))
+    (propagated-inputs (list dconf))
     (synopsis "Telegram Desktop")
     (description "Telegram desktop is the official desktop version of the
 Telegram instant messenger.")