From 7f62dd42f3f44f2af8ff026c96ce91d15e1d594b Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 7 Dec 2013 10:09:25 +0100 Subject: [PATCH] give gnome-menus a better place --- .../core/gnome-menus/default .nix} | 0 pkgs/desktops/gnome-3/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ------ 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/desktops/{cinnamon/gnome-menus.nix => gnome-3/core/gnome-menus/default .nix} (100%) diff --git a/pkgs/desktops/cinnamon/gnome-menus.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default .nix similarity index 100% rename from pkgs/desktops/cinnamon/gnome-menus.nix rename to pkgs/desktops/gnome-3/core/gnome-menus/default .nix diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 8af6d65420a..13fca9f0ab0 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -24,6 +24,8 @@ rec { gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; + gnome-menus = callPackage ../core/gnome-menus{ } ; + gnome_keyring = callPackage ./core/gnome-keyring { }; libgnome_keyring = callPackage ./core/libgnome-keyring { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71bd2dc615c..ac304ad462b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9576,12 +9576,6 @@ let ### DESKTOP ENVIRONMENTS - cinnamon = recurseIntoAttrs rec{ - callPackage=pkgs.newScope pkgs.cinnamon; - inherit (gnome3) gnome_common ; - gnome_menus = callPackage ../desktops/cinnamon/gnome-menus.nix { } ; - }; - enlightenment = callPackage ../desktops/enlightenment { }; e17 = recurseIntoAttrs (