From 826572a9e369e71ef0d19c11e509be890468a2db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Oct 2014 01:23:01 +0100 Subject: [PATCH 1/2] smplayer: update from 14.3.0 to 14.9.0 --- pkgs/applications/video/smplayer/basegui.cpp.patch | 11 +++++++++++ pkgs/applications/video/smplayer/default.nix | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/smplayer/basegui.cpp.patch diff --git a/pkgs/applications/video/smplayer/basegui.cpp.patch b/pkgs/applications/video/smplayer/basegui.cpp.patch new file mode 100644 index 00000000000..05664ee96e6 --- /dev/null +++ b/pkgs/applications/video/smplayer/basegui.cpp.patch @@ -0,0 +1,11 @@ +--- a/src/basegui.cpp 2014-08-20 01:04:51.000000000 +0100 ++++ b/src/basegui.cpp 2014-10-11 10:25:57.561983556 +0100 +@@ -5235,7 +5235,7 @@ + #ifdef YOUTUBE_SUPPORT + void BaseGui::showTubeBrowser() { + qDebug("BaseGui::showTubeBrowser"); +- QString exec = Paths::appPath() + "/smtube"; ++ QString exec = "smtube"; + qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData()); + if (!QProcess::startDetached(exec, QStringList())) { + QMessageBox::warning(this, "SMPlayer", diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 018be742a16..4e4d7a3e4b5 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-14.3.0"; + name = "smplayer-14.9.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18"; + sha256 = "04yzgmdj9hm9v7ln49zm2aa1r9mm9q12pym4bvfww7yzsvnx96j2"; }; + patches = [ ./basegui.cpp.patch ]; + buildInputs = [ qt4 ]; preConfigure = '' From 8280d6522e85a755f354bec638357e09d28ebf05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Oct 2014 10:41:14 +0100 Subject: [PATCH 2/2] smtube: new package SMTube allows to search, play and download Youtube videos. Homepage: http://smplayer.sourceforge.net/smtube.php --- pkgs/applications/video/smtube/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/video/smtube/default.nix diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix new file mode 100644 index 00000000000..d648b5866e0 --- /dev/null +++ b/pkgs/applications/video/smtube/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, qt4}: + +stdenv.mkDerivation { + name = "smtube-14.8.0"; + src = fetchurl { + url = mirror://sourceforge/smplayer/smtube-14.8.0.tar.bz2; + sha256 = "0h0kw4dvdj9sbxp0p6bdib9y8i7854f45lsmrdkykzk6rmgrf1cw"; + }; + + buildInputs = [qt4]; + + preConfigure = '' + makeFlags="PREFIX=$out" + ''; + + meta = with stdenv.lib; { + description = "Play and download Youtube videos"; + homepage = http://smplayer.sourceforge.net/smtube.php; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ vbgl ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a47bd66dd2..5125b9793af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9866,6 +9866,8 @@ let smplayer = callPackage ../applications/video/smplayer { }; + smtube = callPackage ../applications/video/smtube {}; + sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup { ruby = ruby_1_9_3.override { cursesSupport = true;