diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
| commit | 6345089ca0af23a29387f48060a53dff0d0d30f5 (patch) | |
| tree | aa11989838217951662f46c011205e11d525e4dc /pkgs/desktops/gnome-3/core/libgweather/default.nix | |
| parent | 658951917437e7d587c8a206cc6497a7f1192891 (diff) | |
| parent | e69a3248f7c8308b0d583941e8f1bb1a99a431a7 (diff) | |
| download | nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.gz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.bz2 nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.lz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.xz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.zst nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.zip | |
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice in the history, but let's merge this way.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/libgweather/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/libgweather/default.nix | 9 |
1 files changed, 7 insertions, 2 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; |