From 302c8a461246f3901981dfa25eed826c2e16b3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 5 Sep 2020 19:03:52 +0200 Subject: [PATCH] cinnamon.cinnamon-common: init at 4.4.1 --- .../cinnamon/cinnamon-common/default.nix | 154 ++++++++++++++++++ pkgs/desktops/cinnamon/default.nix | 1 + 2 files changed, 155 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-common/default.nix diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix new file mode 100644 index 000000000000..b40869e6333c --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -0,0 +1,154 @@ +{ atk +, autoreconfHook +, cacert +, fetchpatch +, dbus +, cinnamon-control-center +, cinnamon-desktop +, cinnamon-menus +, cjs +, fetchFromGitHub +, gdk-pixbuf +, libgnomekbd +, glib +, gobject-introspection +, gtk3 +, intltool +, json-glib +, libcroco +, libsoup +, libstartup_notification +, libXtst +, muffin +, networkmanager +, pkgconfig +, polkit +, stdenv +, wrapGAppsHook +, libxml2 +, gtk-doc +, gnome3 +, python3 +, keybinder3 +, cairo +, xapps +, upower +, nemo +, libnotify +, accountsservice +, gnome-online-accounts +, glib-networking +, callPackage +, pciutils +, timezonemap +}: + +stdenv.mkDerivation rec { + pname = "cinnamon-common"; + version = "4.4.1"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "cinnamon"; + rev = version; + sha256 = "0sv7nqd1l6c727qj30dcgdkvfh1wxpszpgmbdyh58ilmc8xklnqd"; + }; + + patches = [ + # remove dbus-glib + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/ce99760fa15c3de2e095b9a5372eeaca646fbed1.patch"; + sha256 = "0p2sbdi5w7sgblqbgisb6f8lcj1syzq5vlk0ilvwaqayxjylg8gz"; + }) + ]; + + buildInputs = [ + # TODO: review if we really need this all + (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss pam pexpect ])) + atk + cacert + cinnamon-control-center + cinnamon-desktop + cinnamon-menus + cjs + dbus + gdk-pixbuf + glib + gtk3 + json-glib + libcroco + libsoup + libstartup_notification + libXtst + muffin + networkmanager + pkgconfig + polkit + libxml2 + libgnomekbd + + # bindings + cairo + gnome3.caribou + keybinder3 + upower + xapps + timezonemap + nemo + libnotify + accountsservice + + # gsi bindings + gnome-online-accounts + glib-networking # for goa + ]; + + nativeBuildInputs = [ + gobject-introspection + autoreconfHook + wrapGAppsHook + intltool + gtk-doc + ]; + + autoreconfPhase = '' + GTK_DOC_CHECK=false NOCONFIGURE=1 bash ./autogen.sh + ''; + + configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ]; + + postPatch = '' + substituteInPlace src/Makefile.am \ + --replace "\$(libdir)/muffin" "${muffin}/lib/muffin" + patchShebangs autogen.sh + + find . -type f -exec sed -i \ + -e s,/usr/share/cinnamon,$out/share/cinnamon,g \ + -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ + {} + + + sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py + + sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + + sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings + # this one really IS optional + sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings + + sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py + + # another bunch of optional stuff + sed "s|/usr/bin|/run/current-system/sw/bin|g" -i ./files/usr/bin/cinnamon-launcher + + sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/cinnamon"; + description = "The Cinnamon desktop environment"; + license = [ licenses.gpl2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index fe0bc8620109..5d054e4646de 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -12,6 +12,7 @@ lib.makeScope pkgs.newScope (self: with self; { installPhase = "mv svg $out/share/iso-flags-svg"; }); + cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; cinnamon-menus = callPackage ./cinnamon-menus { };