diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 88c9a0ae0e9..e040e38203b 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 libgdata libgepub libcroco libpeas libgee geocode-glib; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -159,8 +159,6 @@ lib.makeScope pkgs.newScope (self: with self; { eog = callPackage ./core/eog { }; - libgweather = callPackage ./core/libgweather { }; - libzapojit = callPackage ./core/libzapojit { }; mutter = callPackage ./core/mutter { }; diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix similarity index 79% rename from pkgs/desktops/gnome-3/core/libgweather/default.nix rename to pkgs/development/libraries/libgweather/default.nix index f9feb21749a..b5fda25a8c5 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup +{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: -let +stdenv.mkDerivation rec { pname = "libgweather"; version = "3.28.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" ]; 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 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; - buildInputs = [ glib gtk libsoup libxml2 geocode-glib ]; + buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; postPatch = '' chmod +x meson/meson_post_install.py @@ -31,7 +29,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4ae7f28d00..442c2a787a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10785,6 +10785,8 @@ in libgrss = callPackage ../development/libraries/libgrss { }; + libgweather = callPackage ../development/libraries/libgweather { }; + libgxps = callPackage ../development/libraries/libgxps { }; libiio = callPackage ../development/libraries/libiio { };