summary refs log tree commit diff
diff options
context:
space:
mode:
authorflorhizome <florhizome@posteo.net>2023-04-22 11:30:37 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2023-04-22 12:00:25 +0200
commit23f3f853495f936cb0d1c50828e697085e4d9f7d (patch)
tree53a68919c13ca7da5857a70c3ef535158ebc2091
parentf07d5c38c55bf561b2f3948096a6a050fd291fb8 (diff)
downloadguix-23f3f853495f936cb0d1c50828e697085e4d9f7d.tar.gz
gnu: cinnamon: Update to 5.6.2.
* gnu/packages/cinnamon.scm (cinnamon-desktop): Update to 5.4.2.
[arguments]<#:configure-flags>: Enable alsa-support.
[inputs]: Remove PYTHON-2, remove GOBJECT-INTROSPECTION, add LIBEXT, ALSA-LIB.
[native-inputs]: Remove gnu-build-system related packages, add GOBJECT-INTROSPECTION.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-rw-r--r--gnu/packages/cinnamon.scm30
1 files changed, 17 insertions, 13 deletions
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm
index 9093d7c0ca..688e225bb3 100644
--- a/gnu/packages/cinnamon.scm
+++ b/gnu/packages/cinnamon.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 florhizome <florhizome@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
+  #:use-module (guix build utils)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
@@ -35,7 +37,9 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages photo)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages xorg))
@@ -121,7 +125,7 @@ cross-DE solutions.")
 (define-public cinnamon-desktop
   (package
     (name "cinnamon-desktop")
-    (version "3.4.2")
+    (version "5.6.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -130,27 +134,27 @@ cross-DE solutions.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "18mjy80ly9361npjhxpm3n0pkmrwviaqr2kixjb7hyxa6kzzh5xw"))))
-    (build-system gnu-build-system)
-    ;; TODO: package 'libgsystem'.
+                "0rnk0vmpjiz8pgn5y8zizr91ilwzfh9w7cmfsjpqg3h5wkpxz22z"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:glib-or-gtk? #true
+      #:configure-flags #~(list "-Dalsa=true")))
     (inputs
      (list accountsservice
-           gtk+
+           alsa-lib
            glib
-           gobject-introspection
            gnome-common
+           gtk+
            libxkbfile
            libxrandr
-           python-2
+           libxext
            pulseaudio
            xkeyboard-config))
     (native-inputs
-     (list autoconf
-           automake
-           gettext-minimal
-           `(,glib "bin") ; glib-gettextize
-           intltool
-           libtool
+     (list gettext-minimal
+           `(,glib "bin")               ;glib-gettextize
+           gobject-introspection
            pkg-config))
     (home-page "https://github.com/linuxmint/cinnamon-desktop/")
     (synopsis "Library for the Cinnamon Desktop")