From 2d31046a40e2ae5546971728477a0a1a17c49e08 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Thu, 31 Jul 2014 00:27:48 +0200 Subject: gtkpod: bump to 2.1.4 --- pkgs/applications/audio/gtkpod/default.nix | 33 ++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/audio/gtkpod') diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 95a60231297..a13ad240288 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,21 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser -, libglade, flex, libid3tag, libvorbis, intltool }: +{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, + gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag, + libvorbis, hicolor_icon_theme, gdk_pixbuf }: -stdenv.mkDerivation { - name = "gtkpod-1.0.0"; +let + gnome = gnome3_12; + +in stdenv.mkDerivation rec { + version = "2.1.4"; + name = "gtkpod-${version}"; src = fetchurl { - url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz; - sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q"; + url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; + sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa"; }; - buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex - libid3tag libvorbis intltool ]; + propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + + buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta + gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme + hicolor_icon_theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh ''; + preFixup = '' + wrapProgram "$out/bin/gtkpod" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + meta = { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; -- cgit 1.4.1