diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-12-25 17:41:02 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-12-25 20:14:28 -0500 |
| commit | c1599d29d914faa6222915c6342ae73533523b1a (patch) | |
| tree | 794db50a2c38b4cdaf193649cd1df90b8edb6aa9 /pkgs/applications | |
| parent | 1954e6a9493de153b4670e118e1b096304e72962 (diff) | |
| download | nixpkgs-c1599d29d914faa6222915c6342ae73533523b1a.tar nixpkgs-c1599d29d914faa6222915c6342ae73533523b1a.tar.gz nixpkgs-c1599d29d914faa6222915c6342ae73533523b1a.tar.bz2 nixpkgs-c1599d29d914faa6222915c6342ae73533523b1a.tar.lz nixpkgs-c1599d29d914faa6222915c6342ae73533523b1a.tar.xz nixpkgs-c1599d29d914faa6222915c6342ae73533523b1a.tar.zst nixpkgs-c1599d29d914faa6222915c6342ae73533523b1a.zip | |
gcr: rename from gnome3.gcr
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/midori/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/newsreaders/pan/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index aef7143f7e0..2f06451438d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 6091c25ccd9..290810198ad 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 9d51a76f536..308c857644e 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -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" |