cinnamon-desktop: Move from cinnamon scope to top-level

2 files changed, 1 insertions, 81 deletions

diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
deleted file mode 100644
index 9bb7b706f02d..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.2.0";
-
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = pname;
-    rev = version;
-    hash = "sha256-9uewZh0GHQAenTcZpLchgFXSt3vOhxLbaepsJIkjTdI=";
-  };
-
-  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/default.nix b/pkgs/desktops/cinnamon/default.nix
index 3c1b27f911d6..cd08384a5dec 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -3,7 +3,6 @@
 lib.makeScope pkgs.newScope (self: with self; {
   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 { };
@@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
+  cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
   iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14
   iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
   folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14