diff options
| author | Rutger Helling <rhelling@mykolab.com> | 2017-11-22 14:01:15 +0100 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-11-23 20:26:24 -0500 |
| commit | 907ab9e8cbab10413848dfc8982cfc851e03903f (patch) | |
| tree | 46821c70ec8811306db20f7e6aa7126b1eaa43e2 | |
| parent | d7c64ad513ba91c5a076f6c7e1aa60b8583c2546 (diff) | |
| download | guix-907ab9e8cbab10413848dfc8982cfc851e03903f.tar guix-907ab9e8cbab10413848dfc8982cfc851e03903f.tar.gz | |
gnu: utox: Update to 0.16.1.
* gnu/packages/messaging.scm (utox): Update to 0.16.1.
[inputs]: Add check and gtk+.
[native-inputs]: Add pkg-config.
[arguments]: Remove 'fix-freetype-include' and 'patch-cmake-find-utox' phases.
Add 'patch-absolute-filename-libgtk-3' and 'wrap-program' phases.
Signed-off-by: Leo Famulari <leo@famulari.name>
| -rw-r--r-- | gnu/packages/messaging.scm | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b9cd80539a..2d89fef9cf 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -796,7 +796,7 @@ messenger protocol.") (define-public utox (package (name "utox") - (version "0.11.0") + (version "0.16.1") (source (origin (method url-fetch) @@ -805,37 +805,41 @@ messenger protocol.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15s4iwjk1s0kihjqn0f07c9618clbphpr827mds3xddkiwnjz37v")))) + "14xl72y4w1x2kk0cvkcr9pmywllm0r9w2grjqiknwn95pw6yxz6q")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; No test phase. - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-freetype-include - (lambda _ - (substitute* "CMakeLists.txt" - (("/usr/include/freetype2") - (string-append (assoc-ref %build-inputs "freetype") - "/include/freetype2"))))) - (add-before 'install 'patch-cmake-find-utox - (lambda _ - (substitute* "../build/cmake_install.cmake" - (("/uTox-0.11.0/utox") - "/build/utox"))))))) + (add-before 'build 'patch-absolute-filename-libgtk-3 + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "../uTox-0.16.1/src/xlib/gtk.c" + (("libgtk-3.so") + (string-append (assoc-ref inputs "gtk+") + "/lib/libgtk-3.so"))))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/utox") + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas"))))))))) (inputs - ;; TODO: Fix the file chooser dialog; which input does it need? `(("dbus" ,dbus) ("filteraudio" ,filteraudio) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("libsodium" ,libsodium) ("c-toxcore" ,c-toxcore) + ("check" ,check) + ("gtk+" ,gtk+) ("libvpx" ,libvpx) ("libx11" ,libx11) ("libxext" ,libxext) ("libxrender" ,libxrender) ("openal" ,openal) ("v4l-utils" ,v4l-utils))) + (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "Lightweight Tox client") (description "Utox is a lightweight Tox client. Tox is a distributed and secure |