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.

1 files changed, 6 insertions, 5 deletions

diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index d91f06e0c3a1..b7c27ec3d0a9 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
+{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  majorVersion = "0.3";
-  minorVersion = "1.3";
+  majorVersion = "0.4";
+  minorVersion = "3";
   name = "pantheon-terminal-${majorVersion}.${minorVersion}";
   src = fetchurl {
     url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz";
@@ -20,9 +20,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ];
   buildInputs = with gnome3; [
-    perl cmake vala_0_23 pkgconfig glib gtk3 granite libnotify gettext makeWrapper
-    vte_290 libgee gsettings_desktop_schemas defaultIconTheme
+    glib gtk3 granite libnotify gettext vte_290 libgee
+    gsettings_desktop_schemas defaultIconTheme
   ];
   meta = {
     description = "Elementary OS's terminal";