Merge branch 'vlada/gnome3-notg' of https://github.com/vcunat/nixpkgs into x-updates

From vlada:
"The only important change affecting other packages should be major gtk3 update."
"This is only a small part, much left to do. From applications there is only evince, I think."
This commit is contained in:
Shea Levy 2013-02-22 15:13:06 -05:00
commit be380d04f1
37 changed files with 556 additions and 233 deletions

View File

@ -1,59 +0,0 @@
{ fetchurl, stdenv, perl, perlXMLParser, gettext, intltool
, pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme
, libgnome, libgnomeui, scrollkeeper, libxslt
, libglade, libgnome_keyring, dbus, dbus_glib
, poppler, libspectre, djvulibre, shared_mime_info
, makeWrapper, which, ghostscript
, recentListSize ? null # 5 is not enough, allow passing a different number
}:
stdenv.mkDerivation rec {
name = "evince-2.32.0";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/${name}.tar.bz2";
sha256 = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7";
};
buildInputs = [
perl perlXMLParser gettext intltool pkgconfig glib gtk
gnomedocutils gnomeicontheme libgnome libgnomeui libglade
scrollkeeper libgnome_keyring
libxslt # for `xsltproc'
dbus dbus_glib poppler libspectre djvulibre makeWrapper which
ghostscript
];
configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf "
# Do not use nautilus
+ " --disable-nautilus "
# Do not update Scrollkeeper's database (GNOME's help system).
+ "--disable-scrollkeeper";
postUnpack = if recentListSize != null then ''
sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' */shell/ev-open-recent-action.c
sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' */shell/ev-window.c
'' else "";
postInstall = ''
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram "$out/bin/evince" \
--prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share"
'';
meta = {
homepage = http://www.gnome.org/projects/evince/;
description = "Evince, GNOME's document viewer";
longDescription = ''
Evince is a document viewer for multiple document formats. It
currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal
of Evince is to replace the multiple document viewers that exist
on the GNOME Desktop with a single simple application.
'';
license = "GPLv2+";
};
}

View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, glib, pkgconfig, intltool }:
stdenv.mkDerivation {
name = "gsettings-desktop-schemas-3.2.0";
src = fetchurl {
url = mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz;
sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi";
};
buildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) maintainers platforms;
};
}

View File

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

View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, python, pkgconfig, popt, libX11, xextproto, libSM, libICE, libXtst, libXi
, intltool, dbus_glib }:
stdenv.mkDerivation rec {
versionMajor = "2.6";
versionMinor = "3";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "1snh2lmry33756gw5pfjxir3g4lrrx9bhadkaz8cyiz88sp8fi7w";
};
buildInputs = [ python pkgconfig popt libX11 xextproto libSM libICE libXtst libXi intltool dbus_glib ];
}

View File

@ -0,0 +1,62 @@
{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info
, itstool, gnome_icon_theme, libgnome_keyring, gsettings_desktop_schemas
, poppler, ghostscriptX, djvulibre, libspectre
, makeWrapper #, python /*just for tests*/
, recentListSize ? null # 5 is not enough, allow passing a different number
}:
stdenv.mkDerivation rec {
name = "evince-3.6.1";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/${name}.tar.xz";
sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv";
};
buildInputs = [
pkgconfig intltool perl perlXMLParser libxml2
glib gtk3 pango atk gdk_pixbuf
itstool gnome_icon_theme libgnome_keyring gsettings_desktop_schemas
poppler ghostscriptX djvulibre libspectre
makeWrapper
];
configureFlags = [
"--disable-nautilus" # Do not use nautilus
"--disable-dbus" # strange compilation error
];
preConfigure = with stdenv.lib;
optionalString doCheck ''
for file in test/*.py; do
echo "patching $file"
sed '1s,/usr,${python},' -i "$file"
done
'' + optionalString (recentListSize != null) ''
sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
'';
postInstall = ''
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram "$out/bin/evince" \
--prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share"
'' + gsettings_desktop_schemas.doCompileSchemas;
doCheck = false; # would need pythonPackages.dogTail, which is missing
meta = {
homepage = http://www.gnome.org/projects/evince/;
description = "GNOME's document viewer";
longDescription = ''
Evince is a document viewer for multiple document formats. It
currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal
of Evince is to replace the multiple document viewers that exist
on the GNOME Desktop with a single simple application.
'';
license = "GPLv2+";
};
}

View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2
, intltool, polkit, orbit }:
stdenv.mkDerivation rec {
versionMajor = "3.2";
versionMinor = "5";
moduleName = "GConf";
origName = "${moduleName}-${versionMajor}.${versionMinor}";
name = "gconf-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd";
};
buildInputs = [ libxml2 polkit gtk orbit ];
propagatedBuildInputs = [ glib dbus_glib ];
nativeBuildInputs = [ pkgconfig intltool ];
# ToDo: ldap reported as not found but afterwards reported as supported
meta = {
homepage = http://projects.gnome.org/gconf/;
description = "A system for storing application preferences";
};
}

View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }:
stdenv.mkDerivation rec {
name = "gcr-3.6.2";
src = fetchurl {
url = "mirror://gnome/sources/gcr/3.6/${name}.tar.xz";
sha256 = "16xyqxv2hxl3a4m8ahilqcf1ps58w1ijh8dav1l5nqz36ljdn2gp";
};
buildInputs = [
pkgconfig intltool gnupg p11_kit glib
libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk
];
#doCheck = true;
}

View File

@ -0,0 +1,12 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
stdenv.mkDerivation rec {
name = "gnome-icon-theme-3.6.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-icon-theme/3.6/${name}.tar.xz";
sha256 = "0i8hkx2c1g5ckrvbkvs9n47i8fby8p9xs6p5l0mxdx9aq4smak9i";
};
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
}

View File

@ -0,0 +1,26 @@
{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib
, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }:
stdenv.mkDerivation rec {
name = "gnome-keyring-3.6.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz";
sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f";
};
buildInputs = [
dbus libgcrypt pam python gtk3 gconf libgnome_keyring
pango gcr gdk_pixbuf atk p11_kit
];
propagatedBuildInputs = [ glib libtasn1 ];
nativeBuildInputs = [ pkgconfig intltool ];
configureFlags = [
"--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
"--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=$$out/lib/pkcs11/"
];
}

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, gconf }:
stdenv.mkDerivation rec {
versionMajor = "3.4";
versionMinor = "1.1";
name = "gnome-terminal-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
sha256 = "1p9zqjmkxryf2kyghhhwwpsh4kd8y1jzzwc9zxghmpxszi9a5m0l";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte gconf ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
}

View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib
# just for passthru
, gtk3, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
versionMajor = "3.6";
versionMinor = "1";
moduleName = "gsettings-desktop-schemas";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "1rk71q2rky9nzy0zb5jsvxa62vhg7dk65kdgdifq8s761797ga6r";
};
buildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig intltool ];
passthru = {
doCompileSchemas = ''
for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do
cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/
done
${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
'';
};
}

View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2
, libcdio, libxml2, libtool, glib, intltool, gconf, libgnome_keyring, libsoup
, udev, avahi, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
name = "gvfs-1.14.2";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
};
buildInputs =
[ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 gconf
libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
];
nativeBuildInputs = [ pkgconfig intltool ];
enableParallelBuilding = true;
}

View File

@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, libxml2, glib}:
stdenv.mkDerivation rec {
name = "libcroco-0.6.6"; # 3.6.2 release
src = fetchurl {
url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j";
};
buildInputs = [ pkgconfig libxml2 glib ];
}

View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }:
stdenv.mkDerivation rec {
name = "libgnome-keyring-3.6.0";
src = fetchurl {
url = "mirror://gnome/sources/libgnome-keyring/3.6/${name}.tar.xz";
sha256 = "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd";
};
propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) platforms maintainers;
};
}

View File

@ -0,0 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
, pango, gdk_pixbuf, atk }:
stdenv.mkDerivation rec {
name = "libgweather-3.6.2";
src = fetchurl {
url = "mirror://gnome/sources/libgweather/3.6/${name}.tar.xz";
sha256 = "1c50m0zrnfh4g58rzf33dfw8ggslj38c61p8a75905bmj3rfyahg";
};
configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else "";
propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ];
nativeBuildInputs = [ pkgconfig intltool ];
}

View File

@ -0,0 +1,46 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses
, pythonSupport ? false, python, pygtk}:
stdenv.mkDerivation rec {
versionMajor = "0.32";
versionMinor = "2";
moduleName = "vte";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0sj837b9ib36gx00hzdinv23f7w91fd5mcw1p6wdi053yxqw17nn";
};
buildInputs = [ intltool pkgconfig gnome3.glib gnome3.gtk ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = ''
${if pythonSupport then "--enable-python" else "--disable-python"}
'';
postInstall = stdenv.lib.optionalString pythonSupport ''
cd $(toPythonPath $out)/gtk-2.0
for n in *; do
ln -s "gtk-2.0/$n" "../$n"
done
'';
meta = {
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 = "LGPLv2";
maintainers = with stdenv.lib.maintainers; [ astsmtl antono ];
platforms = with stdenv.lib.platforms; linux;
};
}

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
, gnome_doc_utils, intltool, libX11, which }:
stdenv.mkDerivation rec {
versionMajor = "3.4";
versionMinor = "0";
name = "zenity-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz";
sha256 = "1bqbfcvd3kj2xk15fvbcdaqvyg9qvymlhn8cwvg5m6v4gicniw2w";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ gnome3.gtk libxml2 libxslt libX11 ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
}

View File

@ -0,0 +1,55 @@
{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }:
rec {
inherit (pkgs) fetchurl_gnome glib gtk3 atk pango;
gtk = gtk3;
orbit = pkgs.gnome2.ORBit2;
inherit (lib) lowPrio hiPrio appendToName makeOverridable;
__overrides = overrides;
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
at_spi2_atk = lib.lowPrio (callPackage ./core/at-spi2-atk { });
at_spi2_core = callPackage ./core/at-spi2-core { };
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
gconf = callPackage ./core/gconf { };
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
gnome_keyring = callPackage ./core/gnome-keyring { };
libgnome_keyring = callPackage ./core/libgnome-keyring { };
gnome_terminal = callPackage ./core/gnome-terminal { };
gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { });
gvfs = callPackage ./core/gvfs { };
libcroco = callPackage ./core/libcroco {};
libgweather = callPackage ./core/libgweather { };
vte = callPackage ./core/vte { };
zenity = callPackage ./core/zenity { };
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
gnome_dictionary = callPackage ./desktop/gnome-dictionary { };
gnome_desktop = callPackage ./desktop/gnome-desktop { };
# Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { };
# scrollkeeper replacement
rarian = callPackage ./desktop/rarian { };
}

View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3
, intltool, gnome_doc_utils}:
stdenv.mkDerivation rec {
majorVersion = "3.5";
minorVersion = "3";
name = "gnome-desktop-${majorVersion}.${minorVersion}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
sha256 = "1nrqcp1p5cxhfjjy5hjpvkqmzsgl2353a08fg0b11c932v95bsba";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
gnome3.gtk gnome3.glib intltool gnome_doc_utils ];
}

View File

@ -0,0 +1,15 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gnome_doc_utils, intltool, which
, libxml2, libxslt }:
stdenv.mkDerivation rec {
version = "3.5.2";
name = "gnome-dictionary-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-dictionary/3.5/${name}.tar.xz";
sha256 = "1cq32csxn27vir5nlixx337ym2nal9ykq3s1j7yynh2adh4m0jil";
};
buildInputs = [ gnome3.gtk ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libxml2 libxslt gnome3.scrollkeeper ];
}

View File

@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
stdenv.mkDerivation rec {
name = "rarian-0.8.1";
src = fetchurl {
url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
};
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
}

View File

@ -0,0 +1,18 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
src = fetchurl {
url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2;
sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
};
# The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess
preConfigure = "
substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog
cp ${automake}/share/automake*/config.{sub,guess} .
";
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
}

View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, glib, dbus_glib, pkgconfig, libxml2, gtk3, intltool, polkit }:
stdenv.mkDerivation {
name = "GConf-3.2.3";
src = fetchurl {
url = mirror://gnome/sources/GConf/3.2/GConf-3.2.3.tar.xz;
sha256 = "0jd1z9gb1b7mv4g07qm554va6idasf3swgrfqflypdh9s38mvdcy";
};
propagatedBuildInputs = [ glib dbus_glib ];
buildInputs = [ polkit gtk3 libxml2 ];
nativeBuildInputs = [ pkgconfig intltool ];
configureFlags = "--disable-orbit";
meta = {
homepage = http://projects.gnome.org/gconf/;
description = "A system for storing application preferences";
maintainers = [ stdenv.lib.maintainers.urkud ];
inherit (gtk3.meta) platforms;
};
}

View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.30.1";
src = fetchurl {
url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
};
nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.34.1";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz";
sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl";
};
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf, xz
, gdk_pixbuf, xz, at_spi2_atk
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@ -8,21 +8,19 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
name = "gtk+-3.2.4";
name = "gtk+-3.6.4";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz";
sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd";
url = "mirror://gnome/sources/gtk+/3.6/${name}.tar.xz";
sha256 = "18gijn9ghzv7d6np10q9bhp7lwgjb462n3xj1dn9hkwkdyc3gnnv";
};
enableParallelBuilding = true;
nativeBuildInputs = [ perl pkgconfig ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
buildInputs = with xlibs; [
pkgconfig glib atk pango gdk_pixbuf at_spi2_atk
libXrandr libXrender libXcomposite libXi
]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
stdenv.mkDerivation {
name = "gtkmm-3.2.0";
stdenv.mkDerivation rec {
name = "gtkmm-3.6.0";
src = fetchurl {
url = mirror://gnome/sources/gtkmm/3.2/gtkmm-3.2.0.tar.xz;
sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1";
url = "mirror://gnome/sources/gtkmm/3.6/${name}.tar.xz";
sha256 = "0n93z8is5afgpqq0czr5wynr78vpv5lap3ayl4x0iv5cr3am90c8";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -1,21 +1,21 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null
, alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }:
, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }:
stdenv.mkDerivation rec {
name = "libcanberra-0.28";
name = "libcanberra-0.30";
src = fetchurl {
url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz";
sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb";
url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.xz";
sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
};
buildInputs =
[ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ];
buildInputs = # ToDo: gstreamer not found (why?), add (g)udev?
[ pkgconfig libtool alsaLib pulseaudio /*gstreamer gst_plugins_base*/ libvorbis gtk ];
configureFlags = "--disable-oss --disable-schemas-install";
configureFlags = "--disable-oss";
meta = {
description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";
description = "An implementation of the XDG Sound Theme and Name Specifications";
longDescription = ''
libcanberra is an implementation of the XDG Sound Theme and Name

View File

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libxml2, glib}:
stdenv.mkDerivation {
name = "libcroco-0.6.4";
src = fetchurl {
url = mirror://gnome/sources/libcroco/0.6/libcroco-0.6.4.tar.xz;
sha256 = "1sij88na1skd4d5dx75l803fww3v9872q8m2hj6sjlkc839vl5n8";
};
buildInputs = [ pkgconfig libxml2 glib ];
}

View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
intltool }:
stdenv.mkDerivation {
name = "libgnome-keyring-3.2.2";
src = fetchurl {
url = mirror://gnome/sources/libgnome-keyring/3.2/libgnome-keyring-3.2.2.tar.xz;
sha256 = "1cxd2vb1lzm8smq1q45dsn13s6kdqdb60lashdk7hwv035xy9jrb";
};
propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) platforms maintainers;
};
}

View File

@ -1,26 +1,21 @@
{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2
, gettext, intltool, bzip2, glib, python
, gnomeSupport ? true, gdk_pixbuf ? null
, gnome_vfs ? null, libbonobo ? null }:
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, python
}:
assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null
&& glib != null;
with { inherit (stdenv.lib) optionals; };
stdenv.mkDerivation rec {
name = "libgsf-1.14.25";
src = fetchurl {
url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2";
sha256 = "18ni8hwi3q83vs3m6mg6xwd4g7jvss4kz70kzf21k587gvq4hx8j";
};
nativeBuildInputs = [ intltool pkgconfig ];
buildInputs =
[ perl perlXMLParser gettext bzip2 python ]
++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ];
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ gettext bzip2 zlib python ];
propagatedBuildInputs = [ libxml2 glib ]
++ stdenv.lib.optionals gnomeSupport [ libbonobo ];
propagatedBuildInputs = [ libxml2 glib ];
doCheck = true;

View File

@ -1,13 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool, libsoup, GConf3 }:
stdenv.mkDerivation {
name = "libgweather-3.4.1";
src = fetchurl {
url = mirror://gnome/sources/libgweather/3.4/libgweather-3.4.1.tar.xz;
sha256 = "0q0vkggrbvy2ihwcsfynlv5qk9l3wjinls8yvmkb1qisyc4lv77f";
};
configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else "";
propagatedBuildInputs = [ libxml2 gtk3 libsoup GConf3 ];
nativeBuildInputs = [ pkgconfig intltool ];
}

View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco
, gdk_pixbuf, gobjectIntrospection?null, enableIntrospection?false }:
{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo
, libxml2, libgsf, bzip2, libcroco
, gtk2 ? null, gtk3 ? null
, gobjectIntrospection ? null, enableIntrospection ? false }:
# no introspection by default, it's too big
@ -10,9 +12,9 @@ stdenv.mkDerivation rec {
url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz";
sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h";
};
buildInputs = [ libxml2 libgsf bzip2 libcroco gdk_pixbuf ]
++ stdenv.lib.optional enableIntrospection [gobjectIntrospection];
propagatedBuildInputs = [ glib gtk ];
buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ]
++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = ["--enable-introspection=auto"];

View File

@ -3636,8 +3636,6 @@ let
gav = callPackage ../games/gav { };
GConf3 = callPackage ../development/libraries/GConf/3.x.nix { };
gdome2 = callPackage ../development/libraries/gdome2 {
inherit (gnome) gtkdoc;
};
@ -3866,13 +3864,13 @@ let
glib = callPackage ../development/libraries/glib { };
glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
glibmm = callPackage ../development/libraries/glibmm { };
glib_networking = callPackage ../development/libraries/glib-networking {};
atk = callPackage ../development/libraries/atk { };
atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
atkmm = callPackage ../development/libraries/atkmm { };
cairo = callPackage ../development/libraries/cairo {
pixman = pixman_cairo; # it's recommended to be in sync
@ -3888,13 +3886,13 @@ let
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { };
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3-default.nix {
inherit (gnome3) at_spi2_atk;
});
gtk = pkgs.gtk2;
gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { };
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
gtksharp = gtksharp2;
@ -4076,7 +4074,7 @@ let
libcm = callPackage ../development/libraries/libcm { };
libcroco = callPackage ../development/libraries/libcroco {};
inherit (gnome3) libcroco;
libctemplate = callPackage ../development/libraries/libctemplate { };
@ -4146,12 +4144,10 @@ let
libgig = callPackage ../development/libraries/libgig { };
libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { };
libgnome_keyring3 = gnome3.libgnome_keyring;
libgtop = callPackage ../development/libraries/libgtop {};
libgweather = callPackage ../development/libraries/libgweather {};
liblo = callPackage ../development/libraries/liblo { };
liblrdf = librdf;
@ -4242,9 +4238,7 @@ let
libspectre = callPackage ../development/libraries/libspectre { };
libgsf = callPackage ../development/libraries/libgsf {
inherit (gnome) gnome_vfs libbonobo;
};
libgsf = callPackage ../development/libraries/libgsf { };
libiconv = callPackage ../development/libraries/libiconv { };
@ -4372,7 +4366,9 @@ let
libqalculate = callPackage ../development/libraries/libqalculate { };
librsvg = callPackage ../development/libraries/librsvg { };
librsvg = callPackage ../development/libraries/librsvg {
gtk2 = null; gtk3 = null; # neither gtk version by default
};
librsync = callPackage ../development/libraries/librsync { };
@ -6425,7 +6421,7 @@ let
gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas {};
inherit (gnome3) gsettings_desktop_schemas;
hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
@ -6896,14 +6892,7 @@ let
keepassx = callPackage ../applications/misc/keepassx { };
# FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide
# `share/icons/hicolor/icon-theme.cache'. Arbitrarily give this one a
# higher priority.
evince = hiPrio (callPackage ../applications/misc/evince {
inherit (gnome) gnomedocutils gnomeicontheme libgnome
libgnomeui libglade scrollkeeper;
poppler = poppler_0_18;
});
inherit (gnome3) evince;
evolution_data_server = newScope (gnome) ../servers/evolution-data-server { };
@ -8365,6 +8354,11 @@ let
inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
};
gnome3 = callPackage ../desktops/gnome-3 {
callPackage = pkgs.newScope pkgs.gnome3;
self = pkgs.gnome3;
};
gnome = recurseIntoAttrs gnome2;
kde4 = recurseIntoAttrs pkgs.kde47;

View File

@ -374,7 +374,6 @@ in
gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
GConf3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@ -1034,7 +1033,6 @@ in
libgpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libgsf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libgtop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libimobiledevice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libinfinity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
liblapack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };