diff options
Diffstat (limited to 'pkgs/desktops/cinnamon')
41 files changed, 0 insertions, 2660 deletions
diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix deleted file mode 100644 index 587018695d59..000000000000 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, wrapGAppsHook3 -, python3 -, gobject-introspection -, gsettings-desktop-schemas -, gettext -, gtk3 -, glib -, common-licenses -}: - -stdenv.mkDerivation rec { - pname = "bulky"; - version = "3.3"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = "bulky"; - rev = version; - hash = "sha256-S4wAcwlJnXHYQEnP9WApCTjvVHKMrAt7gQ2l8zvFrs0="; - }; - - nativeBuildInputs = [ - wrapGAppsHook3 - gsettings-desktop-schemas - gettext - gobject-introspection - ]; - - buildInputs = [ - (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) - gsettings-desktop-schemas - gtk3 - glib - ]; - - postPatch = '' - substituteInPlace usr/lib/bulky/bulky.py \ - --replace "/usr/share/locale" "$out/share/locale" \ - --replace /usr/share/bulky "$out/share/bulky" \ - --replace /usr/share/common-licenses "${common-licenses}/share/common-licenses" \ - --replace __DEB_VERSION__ "${version}" - ''; - - installPhase = '' - runHook preInstall - chmod +x usr/share/applications/* - cp -ra usr $out - ln -sf $out/lib/bulky/bulky.py $out/bin/bulky - runHook postInstall - ''; - - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - - meta = with lib; { - description = "Bulk rename app"; - mainProgram = "bulky"; - homepage = "https://github.com/linuxmint/bulky"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix deleted file mode 100644 index 35a7a2247f5a..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ /dev/null @@ -1,222 +0,0 @@ -{ atk -, cacert -, dbus -, cinnamon-control-center -, cinnamon-desktop -, cinnamon-menus -, cinnamon-session -, cinnamon-translations -, cjs -, evolution-data-server -, fetchFromGitHub -, fetchpatch -, gdk-pixbuf -, gettext -, libgnomekbd -, glib -, gobject-introspection -, gsound -, gtk3 -, intltool -, json-glib -, callPackage -, libstartup_notification -, libXtst -, libXdamage -, mesa -, muffin -, networkmanager -, pkg-config -, polkit -, lib -, stdenv -, wrapGAppsHook3 -, libxml2 -, gtk-doc -, gnome -, python3 -, keybinder3 -, cairo -, xapp -, upower -, nemo -, libnotify -, accountsservice -, gnome-online-accounts -, glib-networking -, pciutils -, timezonemap -, libnma -, meson -, ninja -, gst_all_1 -, perl -}: - -let - pythonEnv = python3.withPackages (pp: with pp; [ - dbus-python - setproctitle - pygobject3 - pycairo - pp.xapp # don't omit `pp.`, see #213561 - pillow - pyinotify # for looking-glass - pytz - tinycss2 - python-pam - pexpect - distro - requests - ]); -in -stdenv.mkDerivation rec { - pname = "cinnamon-common"; - version = "6.0.4"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = "cinnamon"; - rev = version; - hash = "sha256-I0GJv2lcl5JlKPIiWoKMXTf4OLkznS5MpiOIvZ76bJQ="; - }; - - patches = [ - ./use-sane-install-dir.patch - ./libdir.patch - - # Switch to GNOME Online Accounts GTK - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch"; - includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ]; - hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8="; - }) - ]; - - buildInputs = [ - atk - cacert - cinnamon-control-center - cinnamon-desktop - cinnamon-menus - cjs - dbus - evolution-data-server # for calendar-server - gdk-pixbuf - glib - gsound - gtk3 - json-glib - libstartup_notification - libXtst - libXdamage - mesa - muffin - networkmanager - polkit - pythonEnv - libxml2 - libgnomekbd - gst_all_1.gstreamer - - # bindings - cairo - gnome.caribou - keybinder3 - upower - xapp - timezonemap - nemo - libnotify - accountsservice - libnma - - # gsi bindings - gnome-online-accounts - glib-networking # for goa - ]; - - nativeBuildInputs = [ - gobject-introspection - meson - ninja - wrapGAppsHook3 - intltool - gtk-doc - perl - python3.pkgs.wrapPython - pkg-config - ]; - - postPatch = '' - 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 \ - {} + - - # All optional and may introduce circular dependency. - find ./files/usr/share/cinnamon/applets -type f -exec sed -i \ - -e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g' \ - {} + - - pushd ./files/usr/share/cinnamon/cinnamon-settings - substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"' - substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" - substituteInPlace ./bin/Spices.py --replace "subprocess.run(['/usr/bin/" "subprocess.run(['" \ - --replace 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ - --replace "msgfmt" "${gettext}/bin/msgfmt" - substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" - substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" - popd - - sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} - - patchShebangs src/data-to-c.pl - ''; - - postInstall = '' - # Use locales from cinnamon-translations. - ln -s ${cinnamon-translations}/share/locale $out/share/locale - - # Do not install online accounts module, with a -Donlineaccounts=false c-c-c - # this just shows an empty page. - rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py - - # g-o-a-gtk already provides its own desktop item. - rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop - - # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2. - # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8 - rm -r $out/share/cinnamon/styles.d - ''; - - preFixup = '' - # https://github.com/NixOS/nixpkgs/issues/101881 - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" - ) - - buildPythonPath "$out ${python3.pkgs.xapp}" - - # https://github.com/NixOS/nixpkgs/issues/200397 - patchPythonScript $out/bin/cinnamon-spice-updater - - # https://github.com/NixOS/nixpkgs/issues/129946 - patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py - - # Called as `pkexec cinnamon-settings-users.py`. - wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py - ''; - - passthru = { - providedSessions = [ "cinnamon" "cinnamon2d" "cinnamon-wayland" ]; - }; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon"; - description = "Cinnamon desktop environment"; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch b/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch deleted file mode 100644 index 7783d0b3ad12..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1c99ff9b042d77d97a0841c78fceb7cfbf41aa8b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> -Date: Sun, 28 Feb 2021 05:58:09 +0100 -Subject: [PATCH] libdir patch - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3c1e9a4f..a77d9b3c 100644 ---- a/meson.build -+++ b/meson.build -@@ -14,7 +14,7 @@ includedir = get_option('includedir') - libexecdir = get_option('libexecdir') - desktopdir = join_paths(datadir, 'applications') - schemadir = join_paths(datadir, 'glib-2.0', 'schemas') --pkglibdir = join_paths(libdir, meson.project_name().to_lower()) -+pkglibdir = libdir - servicedir = join_paths(datadir, 'dbus-1', 'services') - pkgdatadir = join_paths(datadir, meson.project_name().to_lower()) - po_dir = join_paths(meson.source_root(), 'po') --- -2.30.0 - diff --git a/pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch b/pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch deleted file mode 100644 index 8cb6949cb2d3..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f7e802959d7a5c217ed574cab30404fc769f174d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> -Date: Sat, 6 Feb 2021 14:26:26 +0100 -Subject: [PATCH] use sane install dir - ---- - meson.build | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index bd803f20..3c1e9a4f 100644 ---- a/meson.build -+++ b/meson.build -@@ -127,8 +127,14 @@ configure_file( - ) - - install_subdir( -- 'files', -- install_dir: '/', -+ 'files/usr', -+ install_dir: get_option('prefix'), -+ strip_directory: true, -+) -+ -+install_subdir( -+ 'files/etc', -+ install_dir: join_paths(get_option('prefix'), 'etc'), - strip_directory: true, - ) - --- -2.30.0 - diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix deleted file mode 100644 index 55ca24d57de0..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, glib -, glib-networking -, gettext -, cinnamon-desktop -, gtk3 -, libnotify -, libxml2 -, colord -, polkit -, libxkbfile -, cinnamon-menus -, libgnomekbd -, libxklavier -, networkmanager -, libgudev -, libwacom -, gnome -, wrapGAppsHook3 -, tzdata -, glibc -, libnma -, modemmanager -, xorg -, gdk-pixbuf -, meson -, ninja -, cinnamon-translations -, python3 -, upower -}: - -stdenv.mkDerivation rec { - pname = "cinnamon-control-center"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-AYnI+k6CzpWUutusCSDR5KhOmv5FWoChotAbCJXTh4I="; - }; - - buildInputs = [ - gtk3 - glib - glib-networking - cinnamon-desktop - libnotify - cinnamon-menus - libxml2 - polkit - libgnomekbd - libxklavier - colord - libgudev - libwacom - tzdata - networkmanager - libnma - modemmanager - xorg.libXxf86misc - xorg.libxkbfile - gdk-pixbuf - upower - ]; - - /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" - ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" - ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ - - postPatch = '' - sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c - sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h - sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c - - patchShebangs meson_install_schemas.py - ''; - - mesonFlags = [ - # use locales from cinnamon-translations - "--localedir=${cinnamon-translations}/share/locale" - # https://github.com/linuxmint/cinnamon-control-center/issues/326 - "-Donlineaccounts=false" - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - wrapGAppsHook3 - gettext - python3 - ]; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon-control-center"; - description = "Collection of configuration plugins used in cinnamon-settings"; - mainProgram = "cinnamon-control-center"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix deleted file mode 100644 index 830abafa2853..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ fetchFromGitHub -, gdk-pixbuf -, gobject-introspection -, gtk3 -, intltool -, meson -, ninja -, pkg-config -, pulseaudio -, python3 -, lib -, stdenv -, systemd -, xkeyboard_config -, xorg -, wrapGAppsHook3 -, glib -}: - -stdenv.mkDerivation rec { - pname = "cinnamon-desktop"; - version = "6.0.0"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-Ay9JyPBsE345dBwQHChkaGuoXiB2nPyvCNhWWphL8kY="; - }; - - outputs = [ "out" "dev" ]; - - propagatedBuildInputs = [ - glib - gtk3 - pulseaudio - ]; - - buildInputs = [ - gdk-pixbuf - systemd - xkeyboard_config - xorg.libxkbfile - xorg.libXext - xorg.libXrandr - ]; - - nativeBuildInputs = [ - meson - ninja - python3 - wrapGAppsHook3 - intltool - pkg-config - gobject-introspection - ]; - - postPatch = '' - chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file - patchShebangs install-scripts/meson_install_schemas.py - sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon-desktop"; - description = "Library and data for various Cinnamon modules"; - - longDescription = '' - The libcinnamon-desktop library provides API shared by several applications - on the desktop, but that cannot live in the platform for various - reasons. There is no API or ABI guarantee, although we are doing our - best to provide stability. Documentation for the API is available with - gtk-doc. - ''; - - license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix deleted file mode 100644 index 78a4f7d94b65..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, runCommand -, nixos-artwork -, glib -, gnome -, gtk3 -, gsettings-desktop-schemas -, extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [ ] -, mint-artwork - -, muffin -, nemo -, xapp -, cinnamon-desktop -, cinnamon-session -, cinnamon-settings-daemon -, cinnamon-common -, bulky -}: - -let - - inherit (lib) concatMapStringsSep; - - gsettingsOverridePackages = [ - # from - mint-artwork - - # on - bulky - muffin - nemo - xapp - cinnamon-desktop - cinnamon-session - cinnamon-settings-daemon - cinnamon-common - gnome.gnome-terminal - gsettings-desktop-schemas - gtk3 - ] ++ extraGSettingsOverridePackages; - - gsettingsOverrides = '' - # Use Fedora's default to make text readable and - # restore ununified menu. - # https://github.com/NixOS/nixpkgs/issues/200017 - [org.gnome.Terminal.Legacy.Settings] - theme-variant='dark' - unified-menu=false - - ${extraGSettingsOverrides} - ''; -in - -# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "cinnamon-gsettings-overrides" { preferLocalBuild = true; } - '' - data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" - schema_dir="$data_dir/glib-2.0/schemas" - - mkdir -p "$schema_dir" - - ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages} - - chmod -R a+w "$data_dir" - - cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF - ${gsettingsOverrides} - EOF - - ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" - '' diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix deleted file mode 100644 index e184e64a889e..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ fetchFromGitHub -, glib -, gobject-introspection -, meson -, ninja -, pkg-config -, lib -, stdenv -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "cinnamon-menus"; - version = "6.0.0"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-zP1jA5Fwxh6QrM5YwJo7SFPWaxkJsv1D84dhIDP5xuI="; - }; - - buildInputs = [ - glib - ]; - - nativeBuildInputs = [ - meson - ninja - wrapGAppsHook3 - pkg-config - gobject-introspection - ]; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon-menus"; - description = "Menu system for the Cinnamon project"; - license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix deleted file mode 100644 index f08a242d4665..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, meson -, ninja -, glib -, dbus -, gettext -, cinnamon-desktop -, cinnamon-common -, intltool -, libxslt -, gtk3 -, libgnomekbd -, gnome -, libtool -, wrapGAppsHook3 -, gobject-introspection -, python3 -, pam -, cairo -, xapp -, xdotool -, xorg -, iso-flags-png-320x420 -}: - -stdenv.mkDerivation rec { - pname = "cinnamon-screensaver"; - version = "6.0.3"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-ncYE2dCIAQxCMCe/5zrDU9iHTIkw+iO/IQl8+pfTvLI="; - }; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - gettext - intltool - dbus # for meson.build - libxslt - libtool - meson - ninja - gobject-introspection - ]; - - buildInputs = [ - # from meson.build - gtk3 - glib - - xorg.libXext - xorg.libXinerama - xorg.libX11 - xorg.libXrandr - - (python3.withPackages (pp: with pp; [ - pygobject3 - setproctitle - python3.pkgs.xapp # The scope prefix is required - pycairo - ])) - xapp - xdotool - pam - cairo - cinnamon-desktop - cinnamon-common - libgnomekbd - gnome.caribou - - # things - iso-flags-png-320x420 - ]; - - postPatch = '' - # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit. - find . -type f -exec sed -i \ - -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ - -e s,/usr/lib/cinnamon-screensaver,$out/lib,g \ - -e s,/usr/share/cinnamon-screensaver,$out/share,g \ - -e s,/usr/share/iso-flag-png,${iso-flags-png-320x420}/share/iso-flags-png,g \ - {} + - ''; - - preFixup = '' - # https://github.com/NixOS/nixpkgs/issues/101881 - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" - ) - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon-screensaver"; - description = "Cinnamon screen locker and screensaver program"; - license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch deleted file mode 100644 index 1b56b3903f3b..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch +++ /dev/null @@ -1,38 +0,0 @@ -From eb4a1eae754f222b1be902c2f050704fb0511cf7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> -Date: Sat, 5 Sep 2020 23:19:23 +0200 -Subject: [PATCH] Use dbus_glib instead of elogind - ---- - cinnamon-session/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build -index d8428dc..1f15115 100644 ---- a/cinnamon-session/meson.build -+++ b/cinnamon-session/meson.build -@@ -56,6 +56,7 @@ cinnamon_session_sources = [ - gdbus_sources, - ] - -+dbus_glib = dependency('dbus-glib-1') - executable('cinnamon-session', - cinnamon_session_sources, - dependencies: [ -@@ -74,7 +75,7 @@ executable('cinnamon-session', - xext, - xrender, - xtest, -- elogind, -+ dbus_glib, - ], - link_with: [ - libegg, -@@ -98,4 +99,3 @@ foreach unit: units - dependencies: unit[2] - ) - endforeach -- --- -2.28.0 - diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch b/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch deleted file mode 100644 index 6c44f93d8f3c..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Sat, 23 Dec 2023 23:24:59 +0800 -Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login - shell - -Users expect their shell profiles to get sourced at startup, which -doesn't happen with wayland sessions. - -This commit brings back that feature, by making the cinnamon-session -wrapper script run a login shell. - -ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35 ---- - cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++ - cinnamon-session/meson.build | 14 +++++++++++++- - 2 files changed, 29 insertions(+), 1 deletion(-) - create mode 100755 cinnamon-session/cinnamon-session.in - -diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in -new file mode 100755 -index 0000000..d9d7cb2 ---- /dev/null -+++ b/cinnamon-session/cinnamon-session.in -@@ -0,0 +1,16 @@ -+#!/bin/sh -+ -+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && -+ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && -+ [ -n "$SHELL" ] && -+ grep -q "$SHELL" /etc/shells && -+ ! (echo "$SHELL" | grep -q "false") && -+ ! (echo "$SHELL" | grep -q "nologin"); then -+ if [ "$1" != '-l' ]; then -+ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" -+ else -+ shift -+ fi -+fi -+ -+exec @libexecdir@/cinnamon-session-binary "$@" -diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build -index 10092ee..3d32fdc 100644 ---- a/cinnamon-session/meson.build -+++ b/cinnamon-session/meson.build -@@ -54,7 +54,7 @@ cinnamon_session_sources = [ - ] - - dbus_glib = dependency('dbus-glib-1') --executable('cinnamon-session', -+executable('cinnamon-session-binary', - cinnamon_session_sources, - dependencies: [ - cinnamon_desktop, -@@ -76,6 +76,18 @@ executable('cinnamon-session', - ], - include_directories: [ rootInclude ], - install: true, -+ install_dir: get_option('libexecdir'), -+) -+ -+script_conf = configuration_data() -+script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir')) -+ -+configure_file( -+ input: 'cinnamon-session.in', -+ output: 'cinnamon-session', -+ install: true, -+ install_dir: get_option('bindir'), -+ configuration: script_conf - ) - - units = [ --- -2.42.0 - diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix deleted file mode 100644 index 47cedfa0a6f5..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ fetchFromGitHub -, cinnamon-desktop -, cinnamon-settings-daemon -, cinnamon-translations -, dbus-glib -, glib -, gsettings-desktop-schemas -, gtk3 -, libcanberra -, libxslt -, makeWrapper -, meson -, ninja -, pkg-config -, python3 -, lib -, stdenv -, systemd -, wrapGAppsHook3 -, xapp -, xorg -, libexecinfo -, pango -}: - -let - pythonEnv = python3.withPackages (pp: with pp; [ - pp.xapp # don't omit `pp.`, see #213561 - pygobject3 - setproctitle - ]); -in -stdenv.mkDerivation rec { - pname = "cinnamon-session"; - version = "6.0.4"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-GtaoqzcnpKbiP4OqhnLkNWzZTUqX/KgVE6JImNMkdGo="; - }; - - patches = [ - ./0001-Use-dbus_glib-instead-of-elogind.patch - ./0002-Use-login-shell-for-wayland-session.patch - ]; - - buildInputs = [ - # meson.build - cinnamon-desktop - gtk3 - glib - libcanberra - pango - xorg.libX11 - xorg.libXext - xapp - xorg.libXau - xorg.libXcomposite - - systemd - - xorg.libXtst - xorg.libXrender - xorg.xtrans - - # other (not meson.build) - cinnamon-settings-daemon - dbus-glib - glib - gsettings-desktop-schemas - pythonEnv # for cinnamon-session-quit - ]; - - nativeBuildInputs = [ - meson - ninja - wrapGAppsHook3 - libexecinfo - python3 - pkg-config - libxslt - ]; - - mesonFlags = [ - # use locales from cinnamon-translations - "--localedir=${cinnamon-translations}/share/locale" - ]; - - postPatch = '' - # patchShebangs requires executable file - chmod +x data/meson_install_schemas.py cinnamon-session-quit/cinnamon-session-quit.py - patchShebangs --build data/meson_install_schemas.py - patchShebangs --host cinnamon-session-quit/cinnamon-session-quit.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${cinnamon-desktop}/share" - --prefix XDG_CONFIG_DIRS : "${cinnamon-settings-daemon}/etc/xdg" - ) - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon-session"; - description = "Cinnamon session manager"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch deleted file mode 100644 index a11660bdb115..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7fa408ebd72c9f1ff7ff4e9d7f4a811465a8a41b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> -Date: Tue, 21 Jan 2020 03:19:28 +0100 -Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix - policy-reload bug - ---- - plugins/power/csd-power-manager.c | 4 ++-- - .../org.cinnamon.settings-daemon.plugins.power.policy.in | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c -index 33f4489..84dd98b 100644 ---- a/plugins/power/csd-power-manager.c -+++ b/plugins/power/csd-power-manager.c -@@ -2529,7 +2529,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager, - #endif - - /* get the data */ -- command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s", -+ command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s", - argument, - manager->priv->backlight_helper_preference_args); - ret = g_spawn_command_line_sync (command, -@@ -2619,7 +2619,7 @@ backlight_helper_set_value (const gchar *argument, - #endif - - /* get the data */ -- command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s", -+ command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s", - argument, value, - manager->priv->backlight_helper_preference_args); - ret = g_spawn_command_line_sync (command, -diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in -index 504f017..3569e8c 100644 ---- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in -+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in -@@ -25,7 +25,7 @@ - <allow_inactive>no</allow_inactive> - <allow_active>yes</allow_active> - </defaults> -- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate> -+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate> - </action> - - </policyconfig> --- -2.30.0 - diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix deleted file mode 100644 index 115ffcdece19..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ fetchFromGitHub -, cinnamon-desktop -, cinnamon-translations -, colord -, glib -, gsettings-desktop-schemas -, gtk3 -, lcms2 -, libcanberra-gtk3 -, libgnomekbd -, libnotify -, libxklavier -, wrapGAppsHook3 -, pkg-config -, lib -, stdenv -, systemd -, upower -, dconf -, cups -, polkit -, librsvg -, libwacom -, xorg -, fontconfig -, tzdata -, nss -, libgudev -, meson -, ninja -}: - -stdenv.mkDerivation rec { - pname = "cinnamon-settings-daemon"; - version = "6.0.0"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-bT6NetCBo3J9IiiJ9Hs4iC1N3n/AP9Q+6wZciuKA4i4="; - }; - - patches = [ - ./csd-backlight-helper-fix.patch - ]; - - buildInputs = [ - cinnamon-desktop - colord - gtk3 - glib - gsettings-desktop-schemas - lcms2 - libcanberra-gtk3 - libgnomekbd - libnotify - libxklavier - systemd - upower - dconf - cups - polkit - librsvg - libwacom - xorg.libXext - xorg.libX11 - xorg.libXi - xorg.libXfixes - fontconfig - nss - libgudev - ]; - - nativeBuildInputs = [ - meson - ninja - wrapGAppsHook3 - pkg-config - ]; - - outputs = [ "out" "dev" ]; - - postPatch = '' - sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h - ''; - - # use locales from cinnamon-translations (not using --localedir because datadir is used) - postInstall = '' - ln -s ${cinnamon-translations}/share/locale $out/share/locale - ''; - - # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper - postFixup = '' - mkdir -p $out/bin/cinnamon-settings-daemon - ln -s $out/libexec/csd-backlight-helper $out/bin/cinnamon-settings-daemon/csd-backlight-helper - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon-settings-daemon"; - description = "Settings daemon for the Cinnamon desktop"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix deleted file mode 100644 index 0c7f018752a3..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gettext -}: - -stdenv.mkDerivation rec { - pname = "cinnamon-translations"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-kLZ0niamPV5Kaq6ZBTp1SMAl6dKMkcC+rodtAoH5+Go="; - }; - - nativeBuildInputs = [ - gettext - ]; - - installPhase = '' - mv usr $out # files get installed like so: msgfmt -o usr/share/locale/$lang/LC_MESSAGES/$dir.mo $file - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cinnamon-translations"; - description = "Translations files for the Cinnamon desktop"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix deleted file mode 100644 index 4ff139ba787e..000000000000 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, gobject-introspection -, pkg-config -, cairo -, glib -, readline -, spidermonkey_102 -, meson -, dbus -, ninja -, which -, libxml2 -}: - -stdenv.mkDerivation rec { - pname = "cjs"; - version = "6.0.0"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = "cjs"; - rev = version; - hash = "sha256-oSqEAZWEVb8NxFTScl8s5Mb04tCGDyVVslYW00s4YYk="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - which # for locale detection - libxml2 # for xml-stripblanks - gobject-introspection - ]; - - buildInputs = [ - cairo - readline - spidermonkey_102 - dbus # for dbus-run-session - ]; - - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dprofiler=disabled" - ]; - - meta = with lib; { - homepage = "https://github.com/linuxmint/cjs"; - description = "JavaScript bindings for Cinnamon"; - - longDescription = '' - This module contains JavaScript bindings based on gobject-introspection. - ''; - - license = with licenses; [ - gpl2Plus - lgpl2Plus - mit - mpl11 - ]; - - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix deleted file mode 100644 index 5b5ca276425a..000000000000 --- a/pkgs/desktops/cinnamon/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ config, pkgs, lib }: - -lib.makeScope pkgs.newScope (self: with self; { - iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // { - buildPhase = "make png-country-320x240-fancy"; - # installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png-320x420"; - installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png"; - }); - - iso-flags-svg = pkgs.iso-flags.overrideAttrs (p: p // { - buildPhase = "mkdir -p $out/share"; - installPhase = "mv svg $out/share/iso-flags-svg"; - }); - - # Extensions added here will be shipped by default - # We keep this in sync with a default Mint installation - # Right now (only) nemo-share is missing - nemoExtensions = [ - folder-color-switcher - nemo-emblems - nemo-fileroller - nemo-python - ]; - - # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix - bulky = callPackage ./bulky { }; - cinnamon-common = callPackage ./cinnamon-common { }; - cinnamon-control-center = callPackage ./cinnamon-control-center { }; - cinnamon-desktop = callPackage ./cinnamon-desktop { }; - cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { }; - cinnamon-menus = callPackage ./cinnamon-menus { }; - cinnamon-translations = callPackage ./cinnamon-translations { }; - cinnamon-screensaver = callPackage ./cinnamon-screensaver { }; - cinnamon-session = callPackage ./cinnamon-session { }; - cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; - cjs = callPackage ./cjs { }; - folder-color-switcher = callPackage ./folder-color-switcher { }; - nemo = callPackage ./nemo { }; - nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { }; - nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { }; - nemo-python = callPackage ./nemo-extensions/nemo-python { }; - nemo-with-extensions = callPackage ./nemo/wrapper.nix { }; - mint-artwork = callPackage ./mint-artwork { }; - mint-cursor-themes = callPackage ./mint-cursor-themes { }; - mint-l-icons = callPackage ./mint-l-icons { }; - mint-l-theme = callPackage ./mint-l-theme { }; - mint-themes = callPackage ./mint-themes { }; - mint-x-icons = callPackage ./mint-x-icons { }; - mint-y-icons = callPackage ./mint-y-icons { }; - muffin = callPackage ./muffin { }; - pix = callPackage ./pix { }; - xapp = callPackage ./xapp { }; - warpinator = callPackage ./warpinator { }; - xreader = callPackage ./xreader { }; - xviewer = callPackage ./xviewer { }; -}) // lib.optionalAttrs config.allowAliases { - # Aliases need to be outside the scope or they will shadow the attributes from parent scope. - xapps = pkgs.cinnamon.xapp; # added 2022-07-27 -} diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix deleted file mode 100644 index d0feadedbf33..000000000000 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, gettext -, python3 -}: - -stdenvNoCC.mkDerivation rec { - pname = "folder-color-switcher"; - version = "1.6.2"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - # They don't really do tags, this is just a named commit. - rev = "18102c72ba072cd83ccee69e9051e87e93cab01a"; - sha256 = "sha256-o2+KfHwPvoqDMBa9C/Sm/grDf0GWcjx2OtT4rhnCk5Q="; - }; - - nativeBuildInputs = [ - gettext - python3.pkgs.wrapPython - ]; - - postPatch = '' - substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \ - --replace "/usr/share/locale" "$out/share/locale" \ - --replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" \ - --replace "/usr/share/folder-color-switcher/color.svg" "$out/share/folder-color-switcher/color.svg" - - substituteInPlace usr/share/caja-python/extensions/caja-folder-color-switcher.py \ - --replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/share $out - - runHook postInstall - ''; - - preFixup = '' - # For Gdk.cairo_surface_create_from_pixbuf() - # TypeError: Couldn't find foreign struct converter for 'cairo.Surface' - buildPythonPath ${python3.pkgs.pycairo} - patchPythonScript $out/share/nemo-python/extensions/nemo-folder-color-switcher.py - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/folder-color-switcher"; - description = "Change folder colors for Nemo and Caja"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix deleted file mode 100644 index ef2c6ec4fa2c..000000000000 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv -, lib -, fetchurl -, glib -, nixos-artwork -}: - -stdenv.mkDerivation rec { - pname = "mint-artwork"; - version = "1.8.2"; - - src = fetchurl { - urls = [ - "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240505123538/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - ]; - hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY="; - }; - - nativeBuildInputs = [ - glib - ]; - - installPhase = '' - mkdir $out - - # note: we fuck up a bunch of stuff but idc - find . -type f -exec sed -i \ - -e s,/usr/share/backgrounds/linuxmint/default_background.jpg,${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png,g \ - -e s,/usr/share,$out/share,g \ - -e s,linuxmint-logo-ring-symbolic,cinnamon-symbolic,g \ - {} + - - # fixup broken symlink - ln -sf ./sele_ring.jpg usr/share/backgrounds/linuxmint/default_background.jpg - - mv etc $out/etc - mv usr/share $out/share - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/mint-artwork"; - description = "Artwork for the cinnamon desktop"; - license = with licenses; [ gpl3Plus cc-by-40 ]; # from debian/copyright - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix deleted file mode 100644 index e0402b2f721b..000000000000 --- a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenvNoCC -, fetchFromGitHub -, lib -}: - -stdenvNoCC.mkDerivation rec { - pname = "mint-cursor-themes"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - # They don't really do tags, this is just a named commit. - rev = "d2c1428b499a347c291dafb13c89699fdbdd4be7"; - hash = "sha256-i2Wf+OKwal9G5hkcAdmGSgX6txu1AHajqqPJdhpJoA0="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/share $out - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/mint-cursor-themes/"; - description = "Linux Mint cursor themes"; - license = licenses.gpl3Plus; - maintainers = teams.cinnamon.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/pkgs/desktops/cinnamon/mint-l-icons/default.nix deleted file mode 100644 index 1fa0dd74242d..000000000000 --- a/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, gnome -, gnome-icon-theme -, hicolor-icon-theme -, gtk3 -}: - -stdenvNoCC.mkDerivation rec { - pname = "mint-l-icons"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-nVdx+d+KpTh9EPLhW0+FFzq3OEyacDSxHgllMm51BKk="; - }; - - propagatedBuildInputs = [ - gnome.adwaita-icon-theme - gnome-icon-theme - hicolor-icon-theme - ]; - - nativeBuildInputs = [ - gtk3 - ]; - - dontDropIconThemeCache = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/share $out - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/mint-l-icons"; - description = "Mint-L icon theme"; - license = licenses.gpl3Plus; # from debian/copyright - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/pkgs/desktops/cinnamon/mint-l-theme/default.nix deleted file mode 100644 index 7d5b84dd8ca0..000000000000 --- a/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, python3 -, sassc -, sass -}: - -stdenvNoCC.mkDerivation rec { - pname = "mint-l-theme"; - version = "1.9.6"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - # They don't really do tags, this is just a named commit. - rev = "1444bacf3ff470db05b663b9c5c3a3419decba60"; - hash = "sha256-n+5PMfNUNJrVSvCXiFdiRQrq6A6WPINcT110J8OV6FQ="; - }; - - nativeBuildInputs = [ - python3 - sassc - sass - ]; - - postPatch = '' - patchShebangs . - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/share $out - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/mint-l-theme"; - description = "Mint-L theme for the Cinnamon desktop"; - license = licenses.gpl3Plus; # from debian/copyright - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix deleted file mode 100644 index 59d1fb142500..000000000000 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenvNoCC -, python3 -, sassc -, sass -}: - -stdenvNoCC.mkDerivation rec { - pname = "mint-themes"; - version = "2.1.6"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-Acf9cwTKDUF1WwIqT3BR8wFpfUNRyZ+8anOIIg3O3CQ="; - }; - - nativeBuildInputs = [ - python3 - sassc - sass - ]; - - preBuild = '' - patchShebangs . - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out - mv usr/share $out - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/mint-themes"; - description = "Mint-X and Mint-Y themes for the cinnamon desktop"; - license = licenses.gpl3; # from debian/copyright - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix deleted file mode 100644 index 8b045980c44a..000000000000 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenvNoCC -, gnome -, gnome-icon-theme -, hicolor-icon-theme -, gtk3 -, humanity-icon-theme -, ubuntu-themes -}: - -stdenvNoCC.mkDerivation rec { - pname = "mint-x-icons"; - version = "1.6.9"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-J5Osy+VosyBhwiiwELMtjDTf3/J6DpuQ4c9DO06fo+4="; - }; - - propagatedBuildInputs = [ - gnome.adwaita-icon-theme - gnome-icon-theme - hicolor-icon-theme - humanity-icon-theme - ubuntu-themes # provides ubuntu-mono-dark - ]; - - nativeBuildInputs = [ - gtk3 - ]; - - dontDropIconThemeCache = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/share $out - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/mint-x-icons"; - description = "Mint/metal theme based on mintified versions of Clearlooks Revamp, Elementary and Faenza"; - license = licenses.gpl3Plus; # from debian/copyright - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix deleted file mode 100644 index f12800e384b4..000000000000 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenvNoCC -, gnome -, gnome-icon-theme -, hicolor-icon-theme -, gtk3 -}: - -stdenvNoCC.mkDerivation rec { - pname = "mint-y-icons"; - version = "1.7.6"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-baBacAatUP/jtU/SEVRa6HceGooMwI9N9arDWqPHR2Y="; - }; - - propagatedBuildInputs = [ - gnome.adwaita-icon-theme - gnome-icon-theme - hicolor-icon-theme - ]; - - nativeBuildInputs = [ - gtk3 - ]; - - dontDropIconThemeCache = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/share $out - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/mint-y-icons"; - description = "Mint-Y icon theme"; - license = licenses.gpl3; # from debian/copyright - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix deleted file mode 100644 index 08a9d3bf91b6..000000000000 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, substituteAll -, cairo -, cinnamon-desktop -, dbus -, desktop-file-utils -, egl-wayland -, glib -, gnome -, gobject-introspection -, graphene -, gtk3 -, json-glib -, libcanberra -, libdrm -, libgnomekbd -, libgudev -, libinput -, libstartup_notification -, libwacom -, libxcvt -, libXdamage -, libxkbcommon -, libXtst -, mesa -, meson -, ninja -, pipewire -, pkg-config -, python3 -, udev -, wayland -, wayland-protocols -, wrapGAppsHook3 -, xorgserver -, xwayland -}: - -stdenv.mkDerivation rec { - pname = "muffin"; - version = "6.0.1"; - - outputs = [ "out" "dev" "man" ]; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - zenity = gnome.zenity; - }) - ]; - - nativeBuildInputs = [ - desktop-file-utils - mesa # needed for gbm - meson - ninja - pkg-config - python3 - wrapGAppsHook3 - xorgserver # for cvt command - gobject-introspection - ]; - - buildInputs = [ - cairo - cinnamon-desktop - dbus - egl-wayland - glib - gtk3 - libcanberra - libdrm - libgnomekbd - libgudev - libinput - libstartup_notification - libwacom - libxcvt - libXdamage - libxkbcommon - pipewire - udev - wayland - wayland-protocols - xwayland - ]; - - propagatedBuildInputs = [ - # required for pkg-config to detect muffin-clutter - json-glib - libXtst - graphene - ]; - - mesonFlags = [ - # Based on Mint's debian/rules. - "-Degl_device=true" - "-Dwayland_eglstream=true" - "-Dxwayland_path=${lib.getExe xwayland}" - ]; - - postPatch = '' - patchShebangs src/backends/native/gen-default-modes.py - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/muffin"; - description = "Window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; - mainProgram = "muffin"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/muffin/fix-paths.patch b/pkgs/desktops/cinnamon/muffin/fix-paths.patch deleted file mode 100644 index 6ac0a431f61f..000000000000 --- a/pkgs/desktops/cinnamon/muffin/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/util.c b/src/core/util.c -index 57b73747d..f424cc81c 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, - - args = g_ptr_array_new (); - -- append_argument (args, "zenity"); -+ append_argument (args, "@zenity@/bin/zenity"); - append_argument (args, type); - - if (display) diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix deleted file mode 100644 index bd9f808638f2..000000000000 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ python3 -, lib -, fetchFromGitHub -, cinnamon-translations -}: - -let - srcs = import ../srcs.nix { inherit fetchFromGitHub; }; -in -python3.pkgs.buildPythonApplication rec { - pname = "nemo-emblems"; - inherit (srcs) version src; - - format = "setuptools"; - - sourceRoot = "${src.name}/nemo-emblems"; - - postPatch = '' - substituteInPlace setup.py \ - --replace "/usr/share" "share" - - substituteInPlace nemo-extension/nemo-emblems.py \ - --replace "/usr/share/locale" "${cinnamon-translations}/share/locale" - ''; - - meta = with lib; { - homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-emblems"; - description = "Change a folder or file emblem in Nemo"; - longDescription = '' - Nemo extension that allows you to change folder or file emblems. - When adding this to nemo-with-extensions you also need to add nemo-python. - ''; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix deleted file mode 100644 index 7bf706f83b5f..000000000000 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, pkg-config -, ninja -, glib -, gtk3 -, nemo -, gnome -, cinnamon-translations -}: - -let - srcs = import ../srcs.nix { inherit fetchFromGitHub; }; -in -stdenv.mkDerivation rec { - pname = "nemo-fileroller"; - inherit (srcs) version src; - - sourceRoot = "${src.name}/nemo-fileroller"; - - nativeBuildInputs = [ - meson - pkg-config - ninja - ]; - - buildInputs = [ - glib - gtk3 - nemo - ]; - - postPatch = '' - substituteInPlace src/nemo-fileroller.c \ - --replace "file-roller" "${lib.getExe gnome.file-roller}" \ - --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" - ''; - - PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; - - meta = with lib; { - homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-fileroller"; - description = "Nemo file roller extension"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix deleted file mode 100644 index 8b6f5f07a1c3..000000000000 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, pkg-config -, ninja -, glib -, gtk3 -, nemo -, python3 -, substituteAll -}: - -let - srcs = import ../srcs.nix { inherit fetchFromGitHub; }; -in -stdenv.mkDerivation rec { - pname = "nemo-python"; - inherit (srcs) version src; - - sourceRoot = "${src.name}/nemo-python"; - - patches = [ - # Load extensions from NEMO_PYTHON_EXTENSION_DIR environment variable - # https://github.com/NixOS/nixpkgs/issues/78327 - ./load-extensions-from-env.patch - - # Required for pygobject_init (). - (substituteAll { - src = ./python-path.patch; - env = "${python3.pkgs.pygobject3}/${python3.sitePackages}"; - }) - ]; - - nativeBuildInputs = [ - meson - pkg-config - ninja - ]; - - buildInputs = [ - glib - gtk3 - nemo - python3 - python3.pkgs.pygobject3 - ]; - - postPatch = '' - # Tries to load libpython3.so via g_module_open (). - substituteInPlace meson.build \ - --replace "get_option('prefix'), get_option('libdir')" "'${python3}/lib'" - ''; - - PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; - - meta = with lib; { - homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-python"; - description = "Python bindings for the Nemo extension library"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch deleted file mode 100644 index ad9a4abdc387..000000000000 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/nemo-python.c b/src/nemo-python.c -index 8d2acdb..900811b 100644 ---- a/src/nemo-python.c -+++ b/src/nemo-python.c -@@ -255,6 +255,7 @@ nemo_module_initialize(GTypeModule *module) - { - gchar *user_extensions_dir; - const gchar *env_string; -+ const gchar *python_extensiondir; - - env_string = g_getenv("NEMO_PYTHON_DEBUG"); - if (env_string != NULL) -@@ -269,8 +270,12 @@ nemo_module_initialize(GTypeModule *module) - - all_types = g_array_new(FALSE, FALSE, sizeof(GType)); - -- // Look in the new global path, $DATADIR/nemo-python/extensions -- nemo_python_load_dir(module, PYTHON_EXTENSION_DIR); -+ // Look in NEMO_PYTHON_EXTENSION_DIR -+ python_extensiondir = g_getenv("NEMO_PYTHON_EXTENSION_DIR"); -+ if (python_extensiondir == NULL) { -+ python_extensiondir = PYTHON_EXTENSION_DIR; -+ } -+ nemo_python_load_dir(module, python_extensiondir); - - // Look in XDG_DATA_DIR, ~/.local/share/nemo-python/extensions - user_extensions_dir = g_build_filename(g_get_user_data_dir(), diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch deleted file mode 100644 index bf6db93385c8..000000000000 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/nemo-python.c b/src/nemo-python.c -index 8d2acdb..ee24143 100644 ---- a/src/nemo-python.c -+++ b/src/nemo-python.c -@@ -197,7 +197,7 @@ nemo_python_init_python (void) - } - - debug("Sanitize the python search path"); -- PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]"); -+ PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]; sys.path.append('@env@')"); - if (PyErr_Occurred()) - { - PyErr_Print(); diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix deleted file mode 100644 index a5ab9dfe9b3e..000000000000 --- a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ fetchFromGitHub }: - -rec { - # When you bump this, you should make sure all nemo-extensions - # are actually using this file since we try to deal with tags - # like nemo-fileroller-5.6.1 according to upstream's wishes. - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = "nemo-extensions"; - rev = version; - sha256 = "sha256-zuE0SO5VJ2kKjK7JgsSf+wJgfyffTHhfICslEoPKK8Q="; - }; -} diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix deleted file mode 100644 index fbc12c13dce0..000000000000 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ fetchFromGitHub -, glib -, gobject-introspection -, meson -, ninja -, pkg-config -, lib -, stdenv -, wrapGAppsHook3 -, libxml2 -, gtk3 -, gvfs -, cinnamon-desktop -, xapp -, libexif -, exempi -, intltool -, shared-mime-info -, cinnamon-translations -, libgsf -}: - -stdenv.mkDerivation rec { - pname = "nemo"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; - }; - - patches = [ - # Load extensions from NEMO_EXTENSION_DIR environment variable - # https://github.com/NixOS/nixpkgs/issues/78327 - ./load-extensions-from-env.patch - ]; - - outputs = [ "out" "dev" ]; - - buildInputs = [ - glib - gtk3 - cinnamon-desktop - libxml2 - xapp - libexif - exempi - gvfs - libgsf - ]; - - nativeBuildInputs = [ - meson - pkg-config - ninja - wrapGAppsHook3 - intltool - shared-mime-info - gobject-introspection - ]; - - mesonFlags = [ - # use locales from cinnamon-translations - "--localedir=${cinnamon-translations}/share/locale" - ]; - - postInstall = '' - # This fixes open as root and handles nemo-with-extensions well. - # https://github.com/NixOS/nixpkgs/issues/297570 - substituteInPlace $out/share/polkit-1/actions/org.nemo.root.policy \ - --replace-fail "$out/bin/nemo" "/run/current-system/sw/bin/nemo" - ''; - - preFixup = '' - # Used for some non-fd.o icons (e.g. xapp-text-case-symbolic) - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${xapp}/share" - ) - ''; - - # Taken from libnemo-extension.pc. - passthru.extensiondir = "lib/nemo/extensions-3.0"; - - meta = with lib; { - homepage = "https://github.com/linuxmint/nemo"; - description = "File browser for Cinnamon"; - license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - mainProgram = "nemo"; - }; -} - diff --git a/pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch b/pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch deleted file mode 100644 index 610b3490cac3..000000000000 --- a/pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/libnemo-private/nemo-module.c b/libnemo-private/nemo-module.c -index 92bcff5..ecadcd8 100644 ---- a/libnemo-private/nemo-module.c -+++ b/libnemo-private/nemo-module.c -@@ -209,11 +209,16 @@ void - nemo_module_setup (void) - { - static gboolean initialized = FALSE; -+ const gchar *extensiondir = NULL; - - if (!initialized) { - initialized = TRUE; - -- load_module_dir (NEMO_EXTENSIONDIR); -+ extensiondir = g_getenv ("NEMO_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NEMO_EXTENSIONDIR; -+ } -+ load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); - } -diff --git a/src/nemo-extensions-list.c b/src/nemo-extensions-list.c -index 944fc5f..983c396 100644 ---- a/src/nemo-extensions-list.c -+++ b/src/nemo-extensions-list.c -@@ -129,7 +129,12 @@ module_get_extensions_for_type (GType type) - int - main (int argc, char *argv[]) - { -- populate_from_directory (NEMO_EXTENSIONDIR); -+ const gchar *extensiondir = NULL; -+ extensiondir = g_getenv ("NEMO_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NEMO_EXTENSIONDIR; -+ } -+ populate_from_directory (extensiondir); - - GList *nd_providers; - GList *l; diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix deleted file mode 100644 index 604247566b84..000000000000 --- a/pkgs/desktops/cinnamon/nemo/wrapper.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ symlinkJoin -, lib -, makeWrapper -, nemo -, nemoExtensions -, extensions ? [ ] -, useDefaultExtensions ? true -}: - -let - selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions); -in -symlinkJoin { - name = "nemo-with-extensions-${nemo.version}"; - - paths = [ nemo ] ++ selectedExtensions; - - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - for f in $(find $out/bin/ $out/libexec/ -type l -not -path "*/.*"); do - wrapProgram "$f" \ - --set "NEMO_EXTENSION_DIR" "$out/${nemo.extensiondir}" \ - --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" - done - - # Don't populate the same nemo actions twice when having this globally installed - # https://github.com/NixOS/nixpkgs/issues/190781#issuecomment-1365601853 - rm -r $out/share/nemo/actions - - # Point to wrapped binary in all service files - for file in "share/dbus-1/services/nemo.FileManager1.service" \ - "share/dbus-1/services/nemo.service" - do - rm "$out/$file" - substitute "${nemo}/$file" "$out/$file" \ - --replace "${nemo}" "$out" - done - ''; - - inherit (nemo) meta; -} diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix deleted file mode 100644 index 8d74bdbe7122..000000000000 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, meson -, ninja -, exiv2 -, libheif -, libjpeg -, libjxl -, libtiff -, gst_all_1 -, libraw -, libsecret -, glib -, gtk3 -, gsettings-desktop-schemas -, librsvg -, libwebp -, lcms2 -, bison -, flex -, clutter-gtk -, wrapGAppsHook3 -, shared-mime-info -, python3 -, desktop-file-utils -, itstool -, xapp -}: - -stdenv.mkDerivation rec { - pname = "pix"; - version = "3.4.1"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - sha256 = "sha256-QkgjUzoBOXE3mxXy/Lq3YkHq7f9oE97FeP7PHIBDHvc="; - }; - - nativeBuildInputs = [ - bison - desktop-file-utils - flex - itstool - meson - ninja - pkg-config - python3 - wrapGAppsHook3 - ]; - - buildInputs = [ - clutter-gtk - exiv2 - glib - gsettings-desktop-schemas - gst_all_1.gst-plugins-base - (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - gst_all_1.gst-libav - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gtk3 - lcms2 - libheif - libjpeg - libjxl - libraw - librsvg - libsecret - libtiff - libwebp - xapp - ]; - - postPatch = '' - chmod +x pix/make-pix-h.py - - patchShebangs data/gschemas/make-enums.py \ - pix/make-pix-h.py \ - po/make-potfiles-in.py \ - postinstall.py \ - pix/make-authors-tab.py - ''; - - # Avoid direct dependency on webkit2gtk-4.0 - # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version - mesonFlags = [ "-Dwebservices=false" ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") - ''; - - meta = with lib; { - description = "Generic image viewer from Linux Mint"; - mainProgram = "pix"; - homepage = "https://github.com/linuxmint/pix"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix deleted file mode 100644 index ca93799f5800..000000000000 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ stdenv -, fetchFromGitHub -, lib -, gobject-introspection -, meson -, ninja -, python3 -, gtk3 -, gdk-pixbuf -, xapp -, wrapGAppsHook3 -, gettext -, polkit -, glib -, gitUpdater -, bubblewrap -}: - -let - pythonEnv = python3.withPackages (pp: with pp; [ - grpcio-tools - protobuf - pygobject3 - setproctitle - pp.xapp - zeroconf - grpcio - setuptools - cryptography - pynacl - netifaces - netaddr - ifaddr - qrcode - ]); -in -stdenv.mkDerivation rec { - pname = "warpinator"; - version = "1.8.4"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-T1boMqzAGMjUD62ZAlWNOe3xUx5H5ZwpR7MNipy/LKA="; - }; - - nativeBuildInputs = [ - meson - ninja - gobject-introspection - wrapGAppsHook3 - gettext - polkit # for its gettext - ]; - - buildInputs = [ - glib - gtk3 - gdk-pixbuf - pythonEnv - xapp - ]; - - mesonFlags = [ - "-Dbundle-grpc=false" - "-Dbundle-zeroconf=false" - ]; - - postPatch = '' - chmod +x install-scripts/* - patchShebangs . - - find . -type f -exec sed -i \ - -e s,/usr/libexec/warpinator,$out/libexec/warpinator,g \ - {} + - - # We make bubblewrap mode always available since - # landlock mode is not supported in old kernels. - substituteInPlace src/warpinator-launch.py \ - --replace-fail '"/usr/bin/python3"' '"${pythonEnv.interpreter}"' \ - --replace-fail "/usr/bin/bwrap" "${bubblewrap}/bin/bwrap" \ - --replace-fail 'GLib.find_program_in_path("bwrap")' "True" - ''; - - passthru.updateScript = gitUpdater { - ignoredVersions = "^master.*"; - }; - - meta = with lib; { - homepage = "https://github.com/linuxmint/warpinator"; - description = "Share files across the LAN"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix deleted file mode 100644 index b55830b56c45..000000000000 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ fetchFromGitHub -, glib -, gobject-introspection -, gtk3 -, libgnomekbd -, gdk-pixbuf -, cairo -, xorg -, meson -, ninja -, pkg-config -, python3 -, lib -, stdenv -, vala -, wrapGAppsHook3 -, inxi -, mate -, dbus -, libdbusmenu-gtk3 -}: - -stdenv.mkDerivation rec { - pname = "xapp"; - version = "2.8.3"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-uWBHCsKcW0vP2HYHQWXPrCSr5NsN2nYWAzBByxJBVrY="; - }; - - # Recommended by upstream, which enables the build of xapp-debug. - # https://github.com/linuxmint/xapp/issues/169#issuecomment-1574962071 - mesonBuildType = "debugoptimized"; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook3 - gobject-introspection - ]; - - buildInputs = [ - (python3.withPackages (ps: with ps; [ - pygobject3 - setproctitle # mate applet - ])) - libgnomekbd - gdk-pixbuf - xorg.libxkbfile - python3.pkgs.pygobject3 # for .pc file - mate.mate-panel # for gobject-introspection - dbus - libdbusmenu-gtk3 - ]; - - # Requires in xapp.pc - propagatedBuildInputs = [ - gtk3 - cairo - glib - ]; - - mesonFlags = [ - "-Dpy-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" - ]; - - postPatch = '' - chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file - patchShebangs schemas/meson_install_schemas.py - - # Patch pastebin & inxi location - sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info - sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info - ''; - - # Fix gtk3 module target dir. Proper upstream solution should be using define_variable. - PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; - - meta = with lib; { - homepage = "https://github.com/linuxmint/xapp"; - description = "Cross-desktop libraries and common resources"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix deleted file mode 100644 index f38392bd4212..000000000000 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, glib -, gobject-introspection -, intltool -, shared-mime-info -, gtk3 -, wrapGAppsHook3 -, libarchive -, libxml2 -, xapp -, meson -, pkg-config -, cairo -, libsecret -, poppler -, libspectre -, libgxps -, webkitgtk_4_1 -, nodePackages -, ninja -, gsettings-desktop-schemas -, djvulibre -, backends ? [ "pdf" "ps" /* "dvi" "t1lib" */ "djvu" "tiff" "pixbuf" "comics" "xps" "epub" ] -}: - -stdenv.mkDerivation rec { - pname = "xreader"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - sha256 = "sha256-MWSAyXQcE8cDdzJISFV7UHheHX+7zF1Ula+LGicvUPM="; - }; - - nativeBuildInputs = [ - shared-mime-info - wrapGAppsHook3 - meson - ninja - pkg-config - gobject-introspection - intltool - ]; - - mesonFlags = [ - "-Dmathjax-directory=${nodePackages.mathjax}" - ] ++ (map (x: "-D${x}=true") backends); - - buildInputs = [ - glib - gtk3 - xapp - cairo - libarchive - libxml2 - libsecret - poppler - libspectre - libgxps - webkitgtk_4_1 - nodePackages.mathjax - djvulibre - ]; - - meta = with lib; { - description = "Document viewer capable of displaying multiple and single page -document formats like PDF and Postscript"; - homepage = "https://github.com/linuxmint/xreader"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.cinnamon.members; - }; -} diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix deleted file mode 100644 index 5f45ed4f6bfa..000000000000 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cinnamon-desktop -, docbook_xsl -, exempi -, gdk-pixbuf -, glib -, gobject-introspection -, gtk3 -, gtk-doc -, itstool -, lcms2 -, libexif -, libjpeg -, libpeas -, librsvg -, libxml2 -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook3 -, xapp -, yelp-tools -}: - -stdenv.mkDerivation rec { - pname = "xviewer"; - version = "3.4.5"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - sha256 = "sha256-J6KDkGPbcRBofsJVmd+1IEapSfSd3ftjz0AggvBI8ck="; - }; - - nativeBuildInputs = [ - cinnamon-desktop - docbook_xsl - gdk-pixbuf - gobject-introspection - gtk-doc - itstool - meson - ninja - pkg-config - python3 - wrapGAppsHook3 - yelp-tools - ]; - - buildInputs = [ - exempi - glib - gtk3 - lcms2 - libexif - libjpeg - libpeas - librsvg - libxml2 - xapp - ]; - - meta = with lib; { - description = "Generic image viewer from Linux Mint"; - mainProgram = "xviewer"; - homepage = "https://github.com/linuxmint/xviewer"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ tu-maurice ] ++ teams.cinnamon.members; - }; -} |