From d6ab3a534fc7ee156c5d457acbb122ea81d8ce2a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Dec 2018 04:11:30 +0100 Subject: [PATCH] libgdata: rename from gnome3.libgdata --- pkgs/desktops/gnome-3/default.nix | 4 +--- .../libraries}/libgdata/default.nix | 14 +++++--------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) rename pkgs/{desktops/gnome-3/core => development/libraries}/libgdata/default.nix (80%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f15f4825aa1..b88180c6166 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -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; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -167,8 +167,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgepub = callPackage ./core/libgepub { }; - libgdata = callPackage ./core/libgdata { }; - libpeas = callPackage ./core/libpeas {}; libgweather = callPackage ./core/libgweather { }; diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix similarity index 80% rename from pkgs/desktops/gnome-3/core/libgdata/default.nix rename to pkgs/development/libraries/libgdata/default.nix index 4cbf0a78d89..b05468a478d 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -1,30 +1,27 @@ { stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib , gobject-introspection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: -let +stdenv.mkDerivation rec { pname = "libgdata"; version = "0.17.9"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; 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"; }; 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; - [ pkgconfig libsoup intltool libxml2 glib gobject-introspection - liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; + [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; propagatedBuildInputs = [ json-glib ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; # Stable version has not been updated for a long time. }; }; @@ -36,5 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl21Plus; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d864ae7547..ea302c2d700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10766,7 +10766,7 @@ in libgdamm = callPackage ../development/libraries/libgdamm { }; - libgdata = gnome3.libgdata; + libgdata = callPackage ../development/libraries/libgdata { }; libgig = callPackage ../development/libraries/libgig { };