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

gnome3.gnome-weather: 3.26.0 -> 3.32.0

Browse Source 
- port to meson
- service files are now build correctly upstream
This commit is contained in:
Tor Hedin Brønner 2019-03-03 19:56:08 +01:00 committed by Jan Tojnar
parent 088c613c42
commit c53f331a78
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
View File

@ -1,29 +1,32 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection
, libgweather, intltool, itstool, geoclue2, gnome-desktop }: , libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-weather-${version}"; name = "gnome-weather-${version}";
version = "3.26.0"; version = "3.32.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; sha256 = "0b7cqd3wfrgm0hps0cb8vhjz0bpjw955hbc4r82l626g8l3hf86w";
}; };
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
buildInputs = [ buildInputs = [
gtk3 gjs gobject-introspection gnome-desktop gtk3 gjs gobject-introspection gnome-desktop
libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
]; ];
# The .service file isn't wrapped with the correct environment postPatch = ''
# so misses GIR files when started. By re-pointing from the gjs # The .service file is not wrapped with the correct environment
# entry point to the wrapped binary we get back to a wrapped # so misses GIR files when started. By re-pointing from the gjs
# binary. # entry point to the wrapped binary we get back to a wrapped
preConfigure = '' # binary.
substituteInPlace "data/org.gnome.Weather.Application.service.in" \ substituteInPlace "data/org.gnome.Weather.service.in" \
--replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \ --replace "Exec=@DATA_DIR@/@APP_ID@" \
"Exec=$out/bin/gnome-weather" "Exec=$out/bin/gnome-weather"
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
''; '';
passthru = { passthru = {