diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index bb863d2501c..0483882ccb0 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,40 +1,35 @@ -# Based on Richard Wallace's post here: http://comments.gmane.org/gmane.linux.distributions.nixos/14734 +{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify, gst_all_1 }: -{ fetchurl, stdenv, pythonPackages, gtk3, libnotify, gst_all_1 }: pythonPackages.buildPythonPackage rec { name = "pithos-${version}"; - version = "1.0.1"; + version = "1.1.1"; - src = fetchurl { - url = "https://github.com/pithos/pithos/archive/${version}.tar.gz"; - sha256 = "67b83927d5111067aefbf034d23880f96b1a2d300464e8491efa80e97e67f50f"; + src = fetchFromGitHub { + owner = "pithos"; + repo = "pithos"; + rev = version; + sha256 = "0373z7g1wd3g1xl8m4ipx5n2ka67a2wcn387nyk8yvgdikm14jm3"; }; postPatch = '' substituteInPlace setup.py --replace "/usr/share" "$out/share" ''; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad libnotify ]; - - pythonPath = with pythonPackages; [ pygobject3 dbus pylast ]; - - propogatedBuildInputs = pythonPath; + propagatedBuildInputs = + [ gtk3 gobjectIntrospection libnotify ] ++ + (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ + (with pythonPackages; [ pygobject3 pylast ]); postInstall = '' - wrapProgram "$out/bin/pithos" --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + wrapProgram "$out/bin/pithos" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; meta = with stdenv.lib; { - description = "Pandora player"; - - longDescription = '' - Pandora Internet Radio player for GNOME - ''; - - homepage = http://pithos.github.io/ ; - + description = "Pandora Internet Radio player for GNOME"; + homepage = http://pithos.github.io/; license = licenses.gpl3; - maintainers = with maintainers; [ obadz ]; }; }