From 8c4dd13e3feaa103083fcd06dfca563e7db74272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 8 Sep 2020 16:49:24 +0200 Subject: [PATCH] nixos/cinnamon: add warpinator & blueberry pkgs --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 4 ++-- pkgs/desktops/cinnamon/default.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a9c059125e8d..a404143a03d4 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -193,8 +193,8 @@ in environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [ # cinnamon team apps - # warp - # blueberry + blueberry + warpinator # external apps shipped with linux-mint hexchat diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 00029bb1fc45..68ccd76211d2 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"; }); + # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { };