alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gnome3: default to 3.22 (#19743)

Browse source 
* gnome3: default to 3.22

* zuki-themes: add src for gnome 3.22, remove 3.18

* gnome3_22.vte_290: copy from gnome3.20

* termite: use vte-select-text from gnome3_20
This commit is contained in:
Alexander Ried 2016-10-22 19:54:20 +02:00 committed by Vladimír Čunát
parent e56832d730
commit 459da7b86e
5 changed files with 48 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -82,7 +82,7 @@ in {
environment.gnome3.packageSet = mkOption {
default = null;
example = literalExample "pkgs.gnome3_20";
example = literalExample "pkgs.gnome3_22";
description = "Which GNOME 3 package set to use.";
apply = p: if p == null then pkgs.gnome3 else p;
};

40
pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix Normal file
View file

@ -0,0 +1,40 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
stdenv.mkDerivation rec {
versionMajor = "0.36";
versionMinor = "3";
moduleName = "vte";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
};
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
configureFlags = [ "--enable-introspection" ];
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
'';
meta = with stdenv.lib; {
homepage = http://www.gnome.org/;
description = "A library implementing a terminal emulator widget for GTK+";
longDescription = ''
VTE is a library (libvte) implementing a terminal emulator widget for
GTK+, and a minimal sample application (vte) using that. Vte is
mainly used in gnome-terminal, but can also be used to embed a
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono lethalman ];
platforms = platforms.linux;
};
}

2
pkgs/desktops/gnome-3/3.22/default.nix
View file

@ -232,6 +232,8 @@ let
vte = callPackage ./core/vte { };
vte_290 = callPackage ./core/vte/2.90.nix { };
vino = callPackage ./core/vino { };
yelp = callPackage ./core/yelp { };

6
pkgs/misc/themes/zuki/default.nix
View file

@ -4,20 +4,20 @@ stdenv.mkDerivation rec {
name = "zuki-themes-${version}";
version = "${gnome3.version}.${date}";
date = {
"3.18" = "2016-06-21";
"3.20" = "2016-07-01";
"3.22" = "2016-10-20";
}."${gnome3.version}";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = "zuki-themes";
rev = {
"3.18" = "5c83a847ad8fab0fe0b82ed2a7db429655ac9c10";
"3.20" = "dda1726ac7b556df2ef9696e530f8c2eaa0aed37";
"3.22" = "a48f0f12f81c49b480f82369ae45cfa49d78b143";
}."${gnome3.version}";
sha256 = {
"3.18" = "1x9zrx5dqq8kivhqj5kjwhy4vwr899pri6jvwxbff5hibvyc7ipy";
"3.20" = "0p7db8a2ni494vwp3b7av7d214fnynf6gr976qma6h9x4ck3phiz";
"3.22" = "05sa5ighq01krbgfd4lddxvbhfqk5x5kgw6jnxwvx9rmmff713s1";
}."${gnome3.version}";
};

4
pkgs/top-level/all-packages.nix
View file

@ -14664,7 +14664,7 @@ in
};
termite = callPackage ../applications/misc/termite {
vte = gnome3.vte-select-text;
vte = gnome3_20.vte-select-text;
};
tesseract = callPackage ../applications/graphics/tesseract { };
@ -15959,7 +15959,7 @@ in
gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { });
gnome3 = gnome3_20;
gnome3 = gnome3_22;
hsetroot = callPackage ../tools/X11/hsetroot { };