From 51088d7d96cbb38260aeda24d1599e1997e5ec86 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 25 Dec 2018 18:29:06 -0500 Subject: [PATCH] gnome-menus: rename from gnome3.gnome-menus --- pkgs/applications/misc/plank/default.nix | 4 ++-- pkgs/applications/misc/pmenu/default.nix | 4 ++-- .../gnome-3/core/gnome-shell-extensions/default.nix | 4 ++-- pkgs/desktops/gnome-3/default.nix | 4 +--- .../core => development/libraries}/gnome-menus/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 12 insertions(+), 13 deletions(-) rename pkgs/{desktops/gnome-3/core => development/libraries}/gnome-menus/default.nix (69%) diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 626e400eac4b..cc6b74dc9989 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 -, bamf, gdk_pixbuf, libdbusmenu-gtk3, file +, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus , wrapGAppsHook, autoreconfHook, gobject-introspection }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ vala atk cairo glib gnome3.gnome-menus + buildInputs = [ vala atk cairo glib gnome-menus gtk3 gnome3.libgee libwnck3 libX11 libXfixes libXi pango gnome3.gnome-common bamf gdk_pixbuf libdbusmenu-gtk3 gnome3.dconf ]; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index b14bb445b5d1..4b39e9291a8a 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python2Packages, gnome3 }: +{ stdenv, fetchFromGitLab, python2Packages, gnome-menus }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python2Packages.wrapPython ]; - buildInputs = [ python2Packages.pygtk gnome3.gnome-menus ]; + buildInputs = [ python2Packages.pygtk gnome-menus ]; pythonPath = [ python2Packages.pygtk ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index ff4263f74e3b..ec6d1af015a5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib -, gnome3, substituteAll }: +, gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix_gmenu.patch; - gmenu_path = "${gnome3.gnome-menus}/lib/girepository-1.0"; + gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index edf687c5d6bf..e79ca7c3af86 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -104,8 +104,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - gnome-menus = callPackage ./core/gnome-menus { }; - gnome-keyring = callPackage ./core/gnome-keyring { }; libgnome-keyring = callPackage ./core/libgnome-keyring { }; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix similarity index 69% rename from pkgs/desktops/gnome-3/core/gnome-menus/default.nix rename to pkgs/development/libraries/gnome-menus/default.nix index 9d49eb5e007c..0538b8ec06be 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gobject-introspection }: stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; + pname = "gnome-menus"; version = "3.10.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; }; @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://www.gnome.org; - description = "Gnome menu specification"; - + description = "Library that implements freedesktops's Desktop Menu Specification in GNOME"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19c28e749dd7..e2f42334c93e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10145,6 +10145,8 @@ in gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; + gnome-menus = callPackage ../development/libraries/gnome-menus { }; + granite = callPackage ../development/libraries/granite { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };