From 3c1fb8271843528e58843ee3aea2db6ce82f21b8 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Thu, 5 Dec 2013 09:14:25 +0100 Subject: [PATCH 1/2] added gnome-menus-3 --- pkgs/desktops/cinnamon/gnome-menus.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/desktops/cinnamon/gnome-menus.nix diff --git a/pkgs/desktops/cinnamon/gnome-menus.nix b/pkgs/desktops/cinnamon/gnome-menus.nix new file mode 100644 index 000000000000..fe332355626b --- /dev/null +++ b/pkgs/desktops/cinnamon/gnome-menus.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, intltool, pkgconfig, glib}: +let + version = "3.10.1"; +in +stdenv.mkDerivation { + name = "gnome-menus-${version}"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz"; + sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; + }; + + + preBuild = "patchShebangs ./scripts"; + + buildInputs=[ intltool pkgconfig glib ]; + + meta = { + homepage = "http://www.gnome.org"; + description = "Gnome menu specification " ; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac304ad462b2..71bd2dc615c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9576,6 +9576,12 @@ 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 ( From 7f62dd42f3f44f2af8ff026c96ce91d15e1d594b Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 7 Dec 2013 10:09:25 +0100 Subject: [PATCH 2/2] 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 8af6d65420a6..13fca9f0ab04 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 71bd2dc615c0..ac304ad462b2 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 (