From 0ba5532d4be027d98cb74cd8d500cfb8ef3806e9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" <urkud.urkud@gmail.com> Date: Sat, 8 Oct 2011 14:08:39 +0000 Subject: [PATCH] gnome-vfs-2.24.4 svn path=/nixpkgs/trunk/; revision=29719 --- pkgs/desktops/gnome-2.28/default.nix | 2 +- .../gnome-2.28/platform/gnome-vfs/default.nix | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 7e56c158fdb1..7516b53bc728 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -100,7 +100,7 @@ pkgs.makeOverridable }; gnome_vfs = import ./platform/gnome-vfs { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; + inherit (pkgs) stdenv fetchurl_gnome pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; inherit (pkgs.gtkLibs) glib; inherit intltool GConf gnome_mime_data; }; diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix index 1e35ac9430bd..c141da4324df 100644 --- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib, glib, fam, hal, cdparanoia -, intltool, GConf, gnome_mime_data}: +{ stdenv, fetchurl_gnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib +, glib, fam, hal, cdparanoia, intltool, GConf, gnome_mime_data}: -stdenv.mkDerivation { - name = "gnome-vfs-2.24.1"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2; - sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw"; + src = fetchurl_gnome { + project = "gnome-vfs"; + major = "2"; minor = "24"; patchlevel = "4"; + sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; buildInputs =