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

gtk+3 core stack: update to 3.12

Browse source
This commit is contained in:
Vladimír Čunát 2014-03-27 20:53:50 +01:00
parent 1dc040a8ad
commit 151ac5ab9e
6 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
View file

@ -2,14 +2,14 @@
, intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec {
versionMajor = "2.10";
versionMinor = "2";
versionMajor = "2.12";
versionMinor = "0";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "1xfh89lydl8d18dhnzwvzcsyyybr5q3ik001qgq520l3qh8shj73";
sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi

6
pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
View file

@ -2,14 +2,14 @@
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation (rec {
versionMajor = "2.10";
versionMinor = "2";
versionMajor = "2.12";
versionMinor = "0";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "1qfxlbmbaihgmqgkxnywnji9wkbvn8pvbv20x5glv3jc9zw5innk";
sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv";
};
buildInputs = [

4
pkgs/development/libraries/atk/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
let
ver_maj = "2.10";
ver_maj = "2.12";
ver_min = "0";
in
stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
sha256 = "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3";
sha256 = "13zijfcmx7sda83qkryzsmr9hw0r3b73xkagq9cmm733fhcl7a28";
};
buildInputs = libintlOrEmpty;

6
pkgs/development/libraries/glib/default.nix
View file

@ -35,8 +35,8 @@ let
ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.38";
ver_min = "2";
ver_maj = "2.40";
ver_min = "0";
in
with { inherit (stdenv.lib) optional optionals optionalString; };
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5";
sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd";
};
buildInputs = [ libelf ]

4
pkgs/development/libraries/gobject-introspection/default.nix
View file

@ -5,7 +5,7 @@
# In that case its about 6MB which could be separated
let
ver_maj = "1.38";
ver_maj = "1.40";
ver_min = "0";
in
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
sha256 = "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m";
sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln";
};
buildInputs = [ flex bison glib pkgconfig python ]

13
pkgs/development/libraries/gtk+/3.x.nix
View file

@ -9,8 +9,8 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
let
ver_maj = "3.10";
ver_min = "7";
ver_maj = "3.12";
ver_min = "0";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@ -18,11 +18,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "09wlsim4immrws0fyvpk03sspsljcsgybrwp73scycah70axxsdp";
sha256 = "0jvf9dawq82x1xsr2f56fw3y7yfwapgdj16gr4d5m6q2shf78sgb";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
buildInputs = [ libxkbcommon ];
@ -33,6 +31,11 @@ stdenv.mkDerivation rec {
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
# demos fail to install, no idea where's the problem
preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
enableParallelBuilding = true;
postInstall = "rm -rf $out/share/gtk-doc";
meta = {