diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/desktop/nautilus/default.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/nautilus/default.nix | 27 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 2 |
4 files changed, 29 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index c2e1c062e9e..e839d793365 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -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 { }; diff --git a/pkgs/desktops/gnome-2/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix deleted file mode 100644 index 3765e6112d6..00000000000 --- a/pkgs/desktops/gnome-2/desktop/nautilus/default.nix +++ /dev/null @@ -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 ]; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix new file mode 100644 index 00000000000..551b9db1246 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -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; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index ccd52d21d44..27d3e41e98d 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -47,6 +47,8 @@ rec { libgweather = callPackage ./core/libgweather { }; + nautilus = callPackage ./core/nautilus { }; + vte = callPackage ./core/vte { }; zenity = callPackage ./core/zenity { }; |