git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #78445 from mkg20001/pkg/cinnamon-session

cinnamon.cinnamon-session: init at 4.4.0

commit22536bf90f983512d38b7dc1128d01e19b552bea authorworldofpeace <worldofpeace@protonmail.ch> dateTue 31 Mar 2020, 14:36 (7 years ago) parenta3d67bf90931ea
3 files changed+144
pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch+38 pkgs/desktops/cinnamon/cinnamon-session/default.nix+105 pkgs/desktops/cinnamon/default.nix+1
pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patchnew file+38
@@ -0,0 +1,38 @@
1+From ddc2c4faeec36675654a2f8f04c3011b807fdf79 Mon Sep 17 00:00:00 2001
2+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
3+Date: Sun, 22 Mar 2020 07:36:25 +0100
4+Subject: [PATCH] Add dbus_glib dependency
5+
6+---
7+ cinnamon-session/meson.build | 2 +-
8+ meson.build | 1 +
9+ 2 files changed, 2 insertions(+), 1 deletion(-)
10+
11+diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
12+index ee8916f..9dd9283 100644
13+--- a/cinnamon-session/meson.build
14++++ b/cinnamon-session/meson.build
15+@@ -74,7 +74,7 @@ executable('cinnamon-session',
16+ xext,
17+ xrender,
18+ xtest,
19+- # elogind,
20++ dbus_glib,
21+ ],
22+ link_with: [
23+ libegg,
24+diff --git a/meson.build b/meson.build
25+index 231a448..db306dc 100644
26+--- a/meson.build
27++++ b/meson.build
28+@@ -48,6 +48,7 @@ else
29+ gconf = dependency('', required: false)
30+ endif
31+ conf.set('HAVE_GCONF', gconf.found())
32++dbus_glib = dependency('dbus-glib-1')
33+
34+
35+ gio_unix = dependency('gio-unix-2.0', required: false)
36+--
37+2.25.1
38+
pkgs/desktops/cinnamon/cinnamon-session/default.nixnew file+105
@@ -0,0 +1,105 @@
1+{ fetchFromGitHub
2+, cinnamon-desktop
3+, cinnamon-settings-daemon
4+, dbus-glib
5+, docbook_xsl
6+, docbook_xml_dtd_412
7+, glib
8+, gsettings-desktop-schemas
9+, gtk3
10+, libcanberra
11+, libxslt
12+, makeWrapper
13+, meson
14+, ninja
15+, pkgconfig
16+, python3
17+, stdenv
18+, systemd
19+, wrapGAppsHook
20+, xapps
21+, xmlto
22+, xorg
23+, cmake
24+, libexecinfo
25+, pango
26+}:
27+
28+stdenv.mkDerivation rec {
29+ pname = "cinnamon-session";
30+ version = "4.4.0";
31+
32+ src = fetchFromGitHub {
33+ owner = "linuxmint";
34+ repo = pname;
35+ rev = version;
36+ sha256 = "0hplck17rksfgqm2z58ajvz4p2m4zg6ksdpbc27ki20iv4fv620s";
37+ };
38+
39+ patches = [
40+ ./0001-Add-dbus_glib-dependency.patch
41+ ];
42+
43+ buildInputs = [
44+ # meson.build
45+ gtk3
46+ glib
47+ libcanberra
48+ pango
49+ xorg.libX11
50+ xorg.libXext
51+ xapps
52+ xorg.libXau
53+ xorg.libXcomposite
54+
55+ systemd
56+
57+ xorg.libXtst
58+ xorg.libXrender
59+ xorg.xtrans
60+
61+ # other (not meson.build)
62+
63+ cinnamon-desktop
64+ cinnamon-settings-daemon
65+ dbus-glib
66+ glib
67+ gsettings-desktop-schemas
68+ ];
69+
70+ nativeBuildInputs = [
71+ meson
72+ ninja
73+ wrapGAppsHook
74+ libexecinfo
75+ docbook_xsl
76+ docbook_xml_dtd_412
77+ python3
78+ pkgconfig
79+ libxslt
80+ xmlto
81+ ];
82+
83+ # TODO: https://github.com/NixOS/nixpkgs/issues/36468
84+ mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ];
85+
86+ postPatch = ''
87+ chmod +x data/meson_install_schemas.py # patchShebangs requires executable file
88+ patchShebangs data/meson_install_schemas.py
89+ '';
90+
91+ preFixup = ''
92+ gappsWrapperArgs+=(
93+ --prefix XDG_DATA_DIRS : "${cinnamon-desktop}/share"
94+ --prefix XDG_CONFIG_DIRS : "${cinnamon-settings-daemon}/etc/xdg"
95+ )
96+ '';
97+
98+ meta = with stdenv.lib; {
99+ homepage = "https://github.com/linuxmint/cinnamon-session";
100+ description = "The Cinnamon session manager";
101+ license = licenses.gpl2;
102+ platforms = platforms.linux;
103+ maintainers = [ maintainers.mkg20001 ];
104+ };
105+}
pkgs/desktops/cinnamon/default.nix+1
@@ -5,6 +5,7 @@ lib.makeScope pkgs.newScope (self: with self; {
55 cinnamon-desktop = callPackage ./cinnamon-desktop { };
66 cinnamon-menus = callPackage ./cinnamon-menus { };
77 cinnamon-translations = callPackage ./cinnamon-translations { };
8+ cinnamon-session = callPackage ./cinnamon-session { };
89 cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
910 cjs = callPackage ./cjs { };
1011 nemo = callPackage ./nemo { };