diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/core/libgweather')
-rw-r--r-- | pkgs/desktops/gnome-3/core/libgweather/default.nix | 9 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/libgweather/src.nix | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 9dbed05523c3..01b3c9bc0930 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -4,9 +4,14 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; + configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool gnome3.vala ]; + + # Prevent building vapi into ${vala} derivation directory + prePatch = '' + substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" + ''; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix index 6324a27b6127..f2cb4c310afc 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgweather-3.24.1"; + name = "libgweather-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz; - sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c"; + url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.0.tar.xz; + sha256 = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e"; }; } |