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

libgweather: rename from gnome3.libgweather

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-25 17:33:21 +01:00
parent 93a6f4414c
commit 3ca8d0f814
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 7 additions and 10 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 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; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -159,8 +159,6 @@ lib.makeScope pkgs.newScope (self: with self; {
eog = callPackage ./core/eog { }; eog = callPackage ./core/eog { };
libgweather = callPackage ./core/libgweather { };
libzapojit = callPackage ./core/libzapojit { }; libzapojit = callPackage ./core/libzapojit { };
mutter = callPackage ./core/mutter { }; mutter = callPackage ./core/mutter { };

11
pkgs/desktops/gnome-3/core/libgweather/default.nix → pkgs/development/libraries/libgweather/default.nix
View File

@ -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 }: , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }:
let stdenv.mkDerivation rec {
pname = "libgweather"; pname = "libgweather";
version = "3.28.2"; version = "3.28.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
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 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708"; sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
}; };
nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; 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 = '' postPatch = ''
chmod +x meson/meson_post_install.py chmod +x meson/meson_post_install.py
@ -31,7 +29,6 @@ in stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.${pname}";
}; };
}; };

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

@ -10785,6 +10785,8 @@ in
libgrss = callPackage ../development/libraries/libgrss { }; libgrss = callPackage ../development/libraries/libgrss { };
libgweather = callPackage ../development/libraries/libgweather { };
libgxps = callPackage ../development/libraries/libgxps { }; libgxps = callPackage ../development/libraries/libgxps { };
libiio = callPackage ../development/libraries/libiio { }; libiio = callPackage ../development/libraries/libiio { };