Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7831025
Attempt to define isolated attrset for gnome-3
Jul 10, 2012
78c742c
GNOME3: at-spi2-core
Jul 17, 2012
cd7027b
GNOME3: at-spi2-atk (TODO: deal with gschemas.compiled conflict)
Jul 17, 2012
9df88a0
GNOME3: Low prio for atk
Aug 16, 2012
049c38a
GNOME3: bump atk version
Aug 16, 2012
dcbc0f5
Merge branch 'master' into gnome-3
Aug 16, 2012
4a1a626
Merge branch 'master' into gnome-3
Aug 27, 2012
90fcea2
Merge branch 'x-updates' into vlada/gnome3-notg
vcunat Feb 21, 2013
713b420
removed some libraries that are up-to-date on the top level
vcunat Jan 29, 2013
811605c
gtk3: major update to 3.6.4
vcunat Feb 21, 2013
4b3e253
update at-spi
vcunat Jan 29, 2013
99bc034
gnome3.gconf: migrate
vcunat Feb 21, 2013
52461be
port gvfs from gnome2
vcunat Feb 21, 2013
99b95f9
gnome3: fix more nativeBuildInputs
vcunat Feb 21, 2013
38a0bc8
add gnome3.gcr; ToDo: tests would fail if enabled
vcunat Jan 29, 2013
b8a4444
gnome3: port and update (lib)gnome-keyring
vcunat Feb 21, 2013
51a413a
gnome3: add gnome-icon-theme
vcunat Feb 21, 2013
bf4313c
update gsettings-desktop-schemas and make system-wide
vcunat Feb 21, 2013
dd4a846
update evince, seems to work now
vcunat Jan 29, 2013
4e5fe00
gnome3.libgweather: update
vcunat Feb 1, 2013
74e0c25
libcanberra: update, streamline dependencies
vcunat Feb 4, 2013
dbe8a69
libcroco: move to gnome-3, minor update
vcunat Feb 4, 2013
bc1e83a
libgsf: update, streamline dependencies, drop obsolete patch
vcunat Feb 4, 2013
2c700f3
librsvg: drop gtk2 dep. by default, add optional gtk3 dep.
vcunat Feb 4, 2013
e817e8f
gnome3: factor out doCompileSchemas
vcunat Feb 21, 2013
9747a3f
gtk bindings: update
vcunat Feb 21, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions pkgs/applications/misc/evince/default.nix

This file was deleted.

17 changes: 0 additions & 17 deletions pkgs/data/misc/gsettings-desktop-schemas/default.nix

This file was deleted.

17 changes: 17 additions & 0 deletions pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
}
17 changes: 17 additions & 0 deletions pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
}
62 changes: 62 additions & 0 deletions pkgs/desktops/gnome-3/core/evince/default.nix
Original file line number Diff line number Diff line change
@@ -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+";
};
}
29 changes: 29 additions & 0 deletions pkgs/desktops/gnome-3/core/gconf/default.nix
Original file line number Diff line number Diff line change
@@ -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";
};
}
18 changes: 18 additions & 0 deletions pkgs/desktops/gnome-3/core/gcr/default.nix
Original file line number Diff line number Diff line change
@@ -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;
}
12 changes: 12 additions & 0 deletions pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
}
26 changes: 26 additions & 0 deletions pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
Original file line number Diff line number Diff line change
@@ -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/"
];
}
20 changes: 20 additions & 0 deletions pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
}
30 changes: 30 additions & 0 deletions pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
Original file line number Diff line number Diff line change
@@ -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/
'';
};
}
21 changes: 21 additions & 0 deletions pkgs/desktops/gnome-3/core/gvfs/default.nix
Original file line number Diff line number Diff line change
@@ -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;
}
11 changes: 11 additions & 0 deletions pkgs/desktops/gnome-3/core/libcroco/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
}
17 changes: 17 additions & 0 deletions pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
Original file line number Diff line number Diff line change
@@ -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;
};
}
14 changes: 14 additions & 0 deletions pkgs/desktops/gnome-3/core/libgweather/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
}
Loading