From cf238ea3d5f733e0eae09a6d9a3e4bea8100ddb4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 00:08:04 +0800
Subject: [PATCH] cinnamon.nemoExtensions: Drop
There is no reason exposing this.
---
pkgs/desktops/cinnamon/default.nix | 11 +----------
pkgs/desktops/cinnamon/nemo/wrapper.nix | 14 ++++++++++++--
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 4fded020ef99..3c1b27f911d6 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,16 +1,6 @@
{ config, pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; {
- # 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 = [
- pkgs.folder-color-switcher
- nemo-emblems
- nemo-fileroller
- nemo-python
- ];
-
cinnamon-common = callPackage ./cinnamon-common { };
cinnamon-control-center = callPackage ./cinnamon-control-center { };
cinnamon-desktop = callPackage ./cinnamon-desktop { };
@@ -40,6 +30,7 @@ lib.makeScope pkgs.newScope (self: with self; {
mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14
mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
+ nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14
diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix
index 0c9cba55370c..2f7216251d20 100644
--- a/pkgs/desktops/cinnamon/nemo/wrapper.nix
+++ b/pkgs/desktops/cinnamon/nemo/wrapper.nix
@@ -1,15 +1,25 @@
{ symlinkJoin
, lib
, makeWrapper
+, folder-color-switcher
, nemo
-, nemoExtensions
+, nemo-emblems
+, nemo-fileroller
+, nemo-python
, python3
, extensions ? [ ]
, useDefaultExtensions ? true
}:
let
- selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions);
+ selectedExtensions = extensions ++ lib.optionals useDefaultExtensions [
+ # We keep this in sync with a default Mint installation
+ # Right now (only) nemo-share is missing
+ folder-color-switcher
+ nemo-emblems
+ nemo-fileroller
+ nemo-python
+ ];
nemoPythonExtensionsDeps = lib.concatMap (x: x.nemoPythonExtensionDeps or []) selectedExtensions;
in
symlinkJoin {