public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgnomekbd: rename from gnome3.libgnomekbd

This commit is contained in:
worldofpeace 2018-12-25 17:54:17 -05:00
parent 702168a67c
commit 0b14f7896d
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr , libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd
, sassc, systemd, gst_all_1 }: , sassc, systemd, gst_all_1 }:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
@ -56,8 +56,7 @@ in stdenv.mkDerivation rec {
}) })
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit (gnome3) libgnomekbd; inherit libgnomekbd unzip;
inherit unzip;
}) })
]; ];

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; 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;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -110,8 +110,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnome-keyring = callPackage ./core/libgnome-keyring { }; libgnome-keyring = callPackage ./core/libgnome-keyring { };
libgnomekbd = callPackage ./core/libgnomekbd { };
gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; gnome-online-accounts = callPackage ./core/gnome-online-accounts { };
gnome-online-miners = callPackage ./core/gnome-online-miners { }; gnome-online-miners = callPackage ./core/gnome-online-miners { };

6
pkgs/desktops/gnome-3/core/libgnomekbd/default.nix → pkgs/development/libraries/libgnomekbd/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: { stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgnomekbd-${version}"; pname = "libgnomekbd";
version = "3.26.0"; version = "3.26.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libgnomekbd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875";
}; };
passthru = { passthru = {
updateScript = gnome3.updateScript { packageName = "libgnomekbd"; attrPath = "gnome3.libgnomekbd"; }; updateScript = gnome3.updateScript { packageName = pname; };
}; };
nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; nativeBuildInputs = [ pkgconfig file intltool makeWrapper ];

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

@ -10786,6 +10786,8 @@ in
libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { };
libgnome-keyring3 = gnome3.libgnome-keyring; libgnome-keyring3 = gnome3.libgnome-keyring;
libgnomekbd = callPackage ../development/libraries/libgnomekbd { };
libglvnd = callPackage ../development/libraries/libglvnd { }; libglvnd = callPackage ../development/libraries/libglvnd { };
libgnurl = callPackage ../development/libraries/libgnurl { }; libgnurl = callPackage ../development/libraries/libgnurl { };