philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

gcr: rename from gnome3.gcr

gstqt5
worldofpeace 2018-12-25 17:41:02 -05:00
parent 1954e6a949
commit c1599d29d9
14 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/desktops/gnome3/gnome-keyring.nix
View File

@ -33,7 +33,7 @@ with lib;
environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];
services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ];
services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ];
};

4
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib, gcr
, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
, gobject-introspection, itstool, libgdata, python3 }:
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
gnome3.gcr gnome3.defaultIconTheme libgdata
gcr gnome3.defaultIconTheme libgdata
];
postPatch = ''

4
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 webkitgtk sqlite gsettings-desktop-schemas gnome3.gcr
gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
(libsoup.override { gnomeSupport = true; }) gnome3.libpeas
glib-networking
];

4
pkgs/applications/networking/newsreaders/pan/default.nix
View File

@ -2,7 +2,7 @@
, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
, makeWrapper, gnupg
, gnomeSupport ? true, gnome3, libsecret
, gnomeSupport ? true, libsecret, gcr
}:
assert spellChecking -> gtkspell3 != null;
@ -20,7 +20,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ];
buildInputs = [ gtk3 gmime2 libnotify gnutls ]
++ stdenv.lib.optional spellChecking gtkspell3
++ stdenv.lib.optionals gnomeSupport [ libsecret gnome3.gcr ];
++ stdenv.lib.optionals gnomeSupport [ libsecret gcr ];
configureFlags = [
"--with-dbus"

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, vala, meson, ninja
, pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, gpgme, python3, openldap
, gnome3, gpgme, python3, openldap, gcr
, libsecret, avahi, p11-kit, openssh }:
stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
python3 gobject-introspection
];
buildInputs = [
gtk3 glib gnome3.gcr
gtk3 glib gcr
gnome3.gsettings-desktop-schemas gnupg
gnome3.defaultIconTheme gpgme
libsecret avahi libsoup p11-kit

2
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr
, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:

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

@ -2,7 +2,7 @@
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, 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
, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt
, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
, sassc, systemd, gst_all_1 }:

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
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;
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;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -74,8 +74,6 @@ lib.makeScope pkgs.newScope (self: with self; {
evolution-data-server = callPackage ./core/evolution-data-server { };
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
gdm = callPackage ./core/gdm { };
gjs = callPackage ./core/gjs { };

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
, gobject-introspection, libpthreadstubs, sqlite
, gobject-introspection, libpthreadstubs, sqlite, gcr
, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }:
let
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ];
buildInputs = [
gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes
libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes
gdk_pixbuf librsvg gnome3.defaultIconTheme
];

10
pkgs/desktops/gnome-3/core/gcr/default.nix → pkgs/development/libraries/gcr/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib
, libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk
, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk_pixbuf, atk
, gobject-introspection, makeWrapper, libxslt, vala, gnome3
, python2 }:
stdenv.mkDerivation rec {
name = "gcr-${version}";
pname = "gcr";
version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gcr/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gcr"; attrPath = "gnome3.gcr"; };
updateScript = gnome3.updateScript { packageName = pname; };
};
postPatch = ''
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk
];
propagatedBuildInputs = [ glib gtk p11-kit ];
propagatedBuildInputs = [ glib gtk3 p11-kit ];
checkInputs = [ python2 ];
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon

2
pkgs/development/libraries/gvfs/default.nix
View File

@ -2,7 +2,7 @@
, glib, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, makeWrapper
, gnomeSupport ? false, gnome, makeWrapper, gcr
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata, python3
}:

4
pkgs/development/libraries/libgdata/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib
{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib, gcr
, gobject-introspection, liboauth, gnome3, p11-kit, openssl, uhttpmock }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
};
NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gcr}/include/gcr-3 -I${gcr}/include/gck-1";
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];

4
pkgs/tools/networking/network-manager/applet.nix
View File

@ -2,7 +2,7 @@
, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3
, libappindicator-gtk3, withGnome ? false }:
, libappindicator-gtk3, withGnome ? false, gcr }:
let
pname = "network-manager-applet";
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
polkit isocodes mobile-broadband-provider-info libgudev
modemmanager jansson glib-networking
libappindicator-gtk3 gnome3.defaultIconTheme
] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser
] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser
nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];

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

@ -4834,7 +4834,7 @@ in
};
pinentry_gnome = res.pinentry.override {
gcr = gnome3.gcr;
inherit gcr;
};
pinentry_qt4 = res.pinentry.override {
@ -9787,6 +9787,8 @@ in
gcab = callPackage ../development/libraries/gcab { };
gcr = callPackages ../development/libraries/gcr { };
gdome2 = callPackage ../development/libraries/gdome2 {
inherit (gnome2) gtkdoc;
};