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

libgdata: rename from gnome3.libgdata

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-25 04:11:30 +01:00
parent 5f77bef30b
commit d6ab3a534f
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -167,8 +167,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgepub = callPackage ./core/libgepub { }; libgepub = callPackage ./core/libgepub { };
libgdata = callPackage ./core/libgdata { };
libpeas = callPackage ./core/libpeas {}; libpeas = callPackage ./core/libpeas {};
libgweather = callPackage ./core/libgweather { }; libgweather = callPackage ./core/libgweather { };

14
pkgs/desktops/gnome-3/core/libgdata/default.nix → pkgs/development/libraries/libgdata/default.nix
View File

@ -1,30 +1,27 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib { stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib
, gobject-introspection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: , gobject-introspection, liboauth, gnome3, p11-kit, openssl, uhttpmock }:
let stdenv.mkDerivation rec {
pname = "libgdata"; pname = "libgdata";
version = "0.17.9"; version = "0.17.9";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; 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${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
buildInputs = with gnome3; buildInputs = with gnome3;
[ pkgconfig libsoup intltool libxml2 glib gobject-introspection [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ];
liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ];
propagatedBuildInputs = [ json-glib ]; propagatedBuildInputs = [ json-glib ];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.${pname}";
versionPolicy = "none"; # Stable version has not been updated for a long time. versionPolicy = "none"; # Stable version has not been updated for a long time.
}; };
}; };
@ -36,5 +33,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
}; };
} }

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

@ -10766,7 +10766,7 @@ in
libgdamm = callPackage ../development/libraries/libgdamm { }; libgdamm = callPackage ../development/libraries/libgdamm { };
libgdata = gnome3.libgdata; libgdata = callPackage ../development/libraries/libgdata { };
libgig = callPackage ../development/libraries/libgig { }; libgig = callPackage ../development/libraries/libgig { };