JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update gtk deps, on GNOME-3.10 branches now

Browse Source
This commit is contained in:
Vladimír Čunát 2013-10-05 20:21:13 +02:00
parent 4bcdeb49a1
commit cb8fff57c1
6 changed files with 44 additions and 19 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.8";
versionMinor = "1";
versionMajor = "2.10";
versionMinor = "0";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "01pxfnksixrjj27ivllpla54r6nkwsjj34acb0phmp76zna9nrgb";
sha256 = "150sqc21difazqd53llwfdaqnwfy73bic9hia41xpfy9kcpzz9yy";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi

5
pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
View File

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

12
pkgs/development/libraries/atk/default.nix
View File

@ -1,11 +1,15 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
let
ver_maj = "2.10";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "atk-2.8.0";
name = "atk-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/atk/2.8/${name}.tar.xz";
sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj";
url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
sha256 = "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3";
};
buildInputs = libintlOrEmpty;
@ -14,6 +18,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ];
#doCheck = true; # no checks in there (2.10.0)
postInstall = "rm -rf $out/share/gtk-doc";
meta = {

14
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -1,12 +1,16 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11
, jasper, libintlOrEmpty, gobjectIntrospection }:
let
ver_maj = "2.30";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.28.2";
name = "gdk-pixbuf-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz";
sha256 = "05s6ksvy1yan6h6zny9n3bmvygcnzma6ljl6i0z9cci2xg116c8q";
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
sha256 = "0n56rbi1acpi8skj8zdhzkm4yv0jq5rzii9n8jhq64k24l2n0wsa";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
@ -20,6 +24,8 @@ stdenv.mkDerivation rec {
+ stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
;
doCheck = false; # broken animation tester
postInstall = "rm -rf $out/share/gtk-doc";
meta = {

16
pkgs/development/libraries/glib/default.nix
View File

@ -10,6 +10,13 @@
# Possible solution: disable compilation of this example somehow
# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
# $out/bin/gtester-report' to postInstall if this is solved
/*
* Use --enable-installed-tests for GNOME-related packages,
and use them as a separately installed tests runned by Hydra
(they should test an already installed package)
https://wiki.gnome.org/GnomeGoals/InstalledTests
* Support org.freedesktop.Application, including D-Bus activation from desktop files
*/
let
# Some packages don't get "Cflags" from pkgconfig correctly
@ -24,15 +31,18 @@ let
done
ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.38";
ver_min = "0";
in
with { inherit (stdenv.lib) optionalString; };
stdenv.mkDerivation rec {
name = "glib-2.36.4";
name = "glib-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz";
sha256 = "0zmdbkg2yjyxdl72w34lxvrssbzqzdficskkfn22s0994dad4m7n";
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "0cpzqadqk6z6bmb79p04pykxc8x57rvshh33414cnk41bvgaf4vm";
};
# configure script looks for d-bus but it is (probably) only needed for tests

10
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -4,12 +4,16 @@
# it may be worth thinking about using multiple derivation outputs
# In that case its about 6MB which could be separated
let
ver_maj = "1.38";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "gobject-introspection-1.36.0";
name = "gobject-introspection-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/1.36/${name}.tar.xz";
sha256 = "10v3idh489vra7pjn1g8f844nnl6719zgkgq3dv38xcf8afnvrz3";
url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
sha256 = "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m";
};
buildInputs = [ flex bison glib pkgconfig python ]