Add gnome3.nautilus and remove gnome2.nautilus (didn't compile)

Some icons are still missing (and theme), didn't find a way to fix that.
This commit is contained in:
Domen Kožar 2014-01-09 17:21:19 +01:00
parent 527aadf5ee
commit d33e5eadd0
6 changed files with 50 additions and 12 deletions

View file

@ -105,8 +105,6 @@ let overridden = set // overrides; set = with overridden; {
gtksourceview = callPackage ./desktop/gtksourceview { };
nautilus = callPackage ./desktop/nautilus { };
gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { };
vte = callPackage ./desktop/vte { };

View file

@ -1,10 +0,0 @@
{stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif, gtk, gnome_desktop, libunique, intltool, GConf}:
stdenv.mkDerivation {
name = "nautilus-2.28.0";
src = fetchurl {
url = mirror://gnome/sources/nautilus/2.28/nautilus-2.28.0.tar.bz2;
sha256 = "0wmskjxf231r2vra22zy02561gh5q10pj3lhzya13dvlliyv4q9p";
};
buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk gnome_desktop libunique intltool GConf ];
}

View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
, gtk, gnome3, libunique, intltool, gobjectIntrospection
, libnotify, makeWrapper, exempi }:
stdenv.mkDerivation rec {
name = "nautilus-3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/nautilus/3.10/${name}.tar.xz";
sha256 = "09y7dxaw4bjgan3q10azky0h6kndqv2lfn75iip12zchf2hk59gn";
};
configureFlags = [ "--enable-tracker=no" ];
buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi
gnome3.gnome_desktop gnome3.gsettings_desktop_schemas libnotify makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/nautilus" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share"
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

View file

@ -47,6 +47,8 @@ rec {
libgweather = callPackage ./core/libgweather { };
nautilus = callPackage ./core/nautilus { };
vte = callPackage ./core/vte { };
zenity = callPackage ./core/zenity { };

View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, expat, zlib, boost }:
stdenv.mkDerivation rec {
name = "exempi-2.2.1";
src = fetchurl {
url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
sha256 = "00d6gycl0wcyd3c71y0jp033a64z203rq0p0y07aig0s0j0477kc";
};
configureFlags = [ "--with-boost=${boost}" ];
buildInputs = [ expat zlib boost ];
meta = with stdenv.lib; {
platforms = platforms.linux;
license = licenses.bsd3;
};
}

View file

@ -876,6 +876,8 @@ let
evtest = callPackage ../applications/misc/evtest { };
exempi = callPackage ../development/libraries/exempi { };
exif = callPackage ../tools/graphics/exif { };
exiftags = callPackage ../tools/graphics/exiftags { };