dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gnome-menus: rename from gnome3.gnome-menus

Browse Source
This commit is contained in:
worldofpeace 2018-12-25 18:29:06 -05:00
parent 2c76519900
commit 51088d7d96
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/plank/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 , 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 }: , wrapGAppsHook, autoreconfHook, gobject-introspection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
autoreconfHook autoreconfHook
]; ];
buildInputs = [ vala atk cairo glib gnome3.gnome-menus buildInputs = [ vala atk cairo glib gnome-menus
gtk3 gnome3.libgee libwnck3 libX11 libXfixes gtk3 gnome3.libgee libwnck3 libX11 libXfixes
libXi pango gnome3.gnome-common bamf gdk_pixbuf libXi pango gnome3.gnome-common bamf gdk_pixbuf
libdbusmenu-gtk3 gnome3.dconf ]; libdbusmenu-gtk3 gnome3.dconf ];

4
pkgs/applications/misc/pmenu/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, python2Packages, gnome3 }: { stdenv, fetchFromGitLab, python2Packages, gnome-menus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pmenu-${version}"; name = "pmenu-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python2Packages.wrapPython ]; nativeBuildInputs = [ python2Packages.wrapPython ];
buildInputs = [ python2Packages.pygtk gnome3.gnome-menus ]; buildInputs = [ python2Packages.pygtk gnome-menus ];
pythonPath = [ python2Packages.pygtk ]; pythonPath = [ python2Packages.pygtk ];

4
pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib { stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib
, gnome3, substituteAll }: , gnome3, gnome-menus, substituteAll }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-shell-extensions-${version}"; name = "gnome-shell-extensions-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix_gmenu.patch; src = ./fix_gmenu.patch;
gmenu_path = "${gnome3.gnome-menus}/lib/girepository-1.0"; gmenu_path = "${gnome-menus}/lib/girepository-1.0";
}) })
]; ];

4
pkgs/desktops/gnome-3/default.nix
View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage 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; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; 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-font-viewer = callPackage ./core/gnome-font-viewer { };
gnome-menus = callPackage ./core/gnome-menus { };
gnome-keyring = callPackage ./core/gnome-keyring { }; gnome-keyring = callPackage ./core/gnome-keyring { };
libgnome-keyring = callPackage ./core/libgnome-keyring { }; libgnome-keyring = callPackage ./core/libgnome-keyring { };

7
pkgs/desktops/gnome-3/core/gnome-menus/default.nix → pkgs/development/libraries/gnome-menus/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, gobject-introspection }: { stdenv, fetchurl, intltool, pkgconfig, glib, gobject-introspection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-menus-${version}"; pname = "gnome-menus";
version = "3.10.1"; version = "3.10.1";
src = fetchurl { 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"; sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
}; };
@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = https://www.gnome.org; 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; platforms = stdenv.lib.platforms.linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -10145,6 +10145,8 @@ in
gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; };
gnome-menus = callPackage ../development/libraries/gnome-menus { };
granite = callPackage ../development/libraries/granite { }; granite = callPackage ../development/libraries/granite { };
elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };