diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-10-01 04:42:03 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-10-09 21:35:54 +0200 |
commit | b12790f5cdfd370f767941daae43f13c003fbbf7 (patch) | |
tree | 8e0ffd8f944c7da1bdf8e075e0fcaad591f26ba7 /pkgs/desktops/gnome/core/gnome-terminal | |
parent | faf40e9572cccca5ba62c9a2debfd67e345fd965 (diff) | |
download | nixpkgs-b12790f5cdfd370f767941daae43f13c003fbbf7.tar nixpkgs-b12790f5cdfd370f767941daae43f13c003fbbf7.tar.gz nixpkgs-b12790f5cdfd370f767941daae43f13c003fbbf7.tar.bz2 nixpkgs-b12790f5cdfd370f767941daae43f13c003fbbf7.tar.lz nixpkgs-b12790f5cdfd370f767941daae43f13c003fbbf7.tar.xz nixpkgs-b12790f5cdfd370f767941daae43f13c003fbbf7.tar.zst nixpkgs-b12790f5cdfd370f767941daae43f13c003fbbf7.zip |
gnome.gnome-terminal: 3.40.1 → 3.42.0
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-terminal')
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-terminal/default.nix | 81 |
1 files changed, 61 insertions, 20 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index ab3e3aecc03..48e65009ade 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,36 +1,79 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus -, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, pcre2 -, libxslt, docbook-xsl-nons }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, python3 +, libxml2 +, gnome +, dconf +, nautilus +, glib +, gtk3 +, gsettings-desktop-schemas +, vte +, gettext +, which +, libuuid +, vala +, desktop-file-utils +, itstool +, wrapGAppsHook +, pcre2 +, libxslt +, docbook-xsl-nons +}: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.40.1"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; + sha256 = "tQ6eVmQjDmyikLzziBKltl4LqsZqSG7iEIlM9nX3Lgs="; }; - buildInputs = [ - gtk3 gsettings-desktop-schemas vte libuuid dconf - # For extension - nautilus + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + which + libxml2 + libxslt + glib # for glib-compile-schemas + docbook-xsl-nons + vala + desktop-file-utils + wrapGAppsHook + pcre2 + python3 ]; - nativeBuildInputs = [ - pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons - vala desktop-file-utils wrapGAppsHook pcre2 + buildInputs = [ + glib + gtk3 + gsettings-desktop-schemas + vte + libuuid + dconf + nautilus # For extension ]; - # Silly ./configure, it looks for dbus file from gnome-shell in the + # Silly build system, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - ''; + substituteInPlace src/meson.build \ + --replace "gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml'" \ + "'${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml'" - configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 + patchShebangs \ + data/icons/meson_updateiconcache.py \ + data/meson_desktopfile.py \ + src/meson_compileschemas.py + ''; passthru = { updateScript = gnome.updateScript { @@ -39,8 +82,6 @@ stdenv.mkDerivation rec { }; }; - enableParallelBuilding = true; - meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; |