| Message ID | 4a6f3c9ec4eb3ea9c9681586498ab88da9105a26.1710348449.git.vivien@planete-kraus.eu |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#69778,gnome-team] gnu: telegram: Build with glibmm@2.76. | expand |
Am Mittwoch, dem 13.03.2024 um 17:45 +0100 schrieb Vivien Kraus: > * gnu/packages/telegram.scm (glibmm-for-telegram-desktop): New > variable. > (telegram-desktop): Use glibmm-for-telegram-desktop instead of > glibmm. > > Change-Id: I0ec4ebc549dd867db22d68ee6317d1630cf1bfd8 > --- > > Dear Guix, > > While we are waiting for the telegram-desktop update in #67493, here > is a minimally intrusive way to keep it working on gnome-team, by > using an older version of glibmm. > > Best regards, > > Vivien > > gnu/packages/telegram.scm | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm > index 7d02824efa..16d36b2c7c 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -74,7 +74,9 @@ (define-module (gnu packages telegram) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > #:use-module (guix gexp) > + #:use-module (guix download) > #:use-module (guix git-download) > + #:use-module (guix utils) > #:use-module (guix build-system cmake) > #:use-module (guix build-system copy) > #:use-module (guix build-system glib-or-gtk) > @@ -267,6 +269,21 @@ (define tgcalls-for-telegram-desktop > (base32 > "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) > > +(define-public glibmm-for-telegram-desktop > + (hidden-package > + (package > + (inherit glibmm) > + (name "glibmm-for-telegram-desktop") > + (version "2.76.0") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://gnome/sources/glibmm/" > + (version-major+minor version) > + "/glibmm-" version ".tar.xz")) > + (sha256 > + (base32 > + > "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6"))))))) > + Canonically, inherited packages are put in the same files as the package they inherit. Cheers
Hi, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Mittwoch, dem 13.03.2024 um 17:45 +0100 schrieb Vivien Kraus: >> * gnu/packages/telegram.scm (glibmm-for-telegram-desktop): New >> variable. >> (telegram-desktop): Use glibmm-for-telegram-desktop instead of >> glibmm. >> >> Change-Id: I0ec4ebc549dd867db22d68ee6317d1630cf1bfd8 >> --- >> >> Dear Guix, >> >> While we are waiting for the telegram-desktop update in #67493, here >> is a minimally intrusive way to keep it working on gnome-team, by >> using an older version of glibmm. >> >> Best regards, >> >> Vivien >> >> gnu/packages/telegram.scm | 19 ++++++++++++++++++- >> 1 file changed, 18 insertions(+), 1 deletion(-) >> >> diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm >> index 7d02824efa..16d36b2c7c 100644 >> --- a/gnu/packages/telegram.scm >> +++ b/gnu/packages/telegram.scm >> @@ -74,7 +74,9 @@ (define-module (gnu packages telegram) >> #:use-module ((guix licenses) #:prefix license:) >> #:use-module (guix packages) >> #:use-module (guix gexp) >> + #:use-module (guix download) >> #:use-module (guix git-download) >> + #:use-module (guix utils) >> #:use-module (guix build-system cmake) >> #:use-module (guix build-system copy) >> #:use-module (guix build-system glib-or-gtk) >> @@ -267,6 +269,21 @@ (define tgcalls-for-telegram-desktop >> (base32 >> "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) >> >> +(define-public glibmm-for-telegram-desktop >> + (hidden-package >> + (package >> + (inherit glibmm) >> + (name "glibmm-for-telegram-desktop") >> + (version "2.76.0") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "mirror://gnome/sources/glibmm/" >> + (version-major+minor version) >> + "/glibmm-" version ".tar.xz")) >> + (sha256 >> + (base32 >> + >> "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6"))))))) >> + > Canonically, inherited packages are put in the same files as the > package they inherit. Yes. That's important to avoid the dreaded circular module import problem (info "(guix) Cyclic Module Dependencies").
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 7d02824efa..16d36b2c7c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -74,7 +74,9 @@ (define-module (gnu packages telegram) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) + #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) @@ -267,6 +269,21 @@ (define tgcalls-for-telegram-desktop (base32 "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) +(define-public glibmm-for-telegram-desktop + (hidden-package + (package + (inherit glibmm) + (name "glibmm-for-telegram-desktop") + (version "2.76.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 + "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6"))))))) + (define-public webrtc-for-telegram-desktop (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") (revision "389")) @@ -500,7 +517,7 @@ (define-public telegram-desktop fcitx5-qt ffmpeg glib - glibmm + glibmm-for-telegram-desktop gtk+ hime hunspell