diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-09-24 13:15:50 +0200 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2017-09-24 12:15:50 +0100 |
commit | 69698ec11cc0619d84b14764fa9e708fe7e7223c (patch) | |
tree | 9d9f602554b497a3265caf5e2ef4821e12736686 /pkgs/desktops/gnome-3/core/gnome-terminal | |
parent | 23b19efdc9c8d64177cefcaa5b919db966bb8f5e (diff) | |
download | nixlib-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar nixlib-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.gz nixlib-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.bz2 nixlib-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.lz nixlib-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.xz nixlib-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.zst nixlib-69698ec11cc0619d84b14764fa9e708fe7e7223c.zip |
gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-terminal')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 32 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-terminal/src.nix | 10 |
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix new file mode 100644 index 000000000000..073a791ac3c8 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32 +, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools + gnome3.dconf itstool gnome3.nautilus vala_0_32 ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 + desktop_file_utils wrapGAppsHook ]; + + # Silly ./configure, 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' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + ''; + + # FIXME: enable for gnome3 + configureFlags = [ "--disable-migration" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The GNOME Terminal Emulator"; + homepage = https://wiki.gnome.org/Apps/Terminal/; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix new file mode 100644 index 000000000000..2aa084cc4935 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-terminal-3.24.2"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz; + sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f"; + }; +} |