From c74b3e26f74cc28995f0e4ed4cce487f1c07d481 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 23 Jun 2013 14:53:18 +0800 Subject: [PATCH 1/2] kmplayer: update to 0.11.3d --- pkgs/applications/video/kmplayer/builder.sh | 9 --------- pkgs/applications/video/kmplayer/default.nix | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/video/kmplayer/builder.sh diff --git a/pkgs/applications/video/kmplayer/builder.sh b/pkgs/applications/video/kmplayer/builder.sh deleted file mode 100644 index 92c7515c9a90..000000000000 --- a/pkgs/applications/video/kmplayer/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|files.length|files.size|" \ - -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index a762bed0e28c..5f6c2259d1cb 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,17 +1,23 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: +{ stdenv, fetchurl, cmake, pkgconfig, gettext +, kdelibs, gtk +}: stdenv.mkDerivation { - name = "kmplayer-0.11.2c"; + name = "kmplayer-0.11.3d"; + src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2; - sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m"; + url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; - builder = ./builder.sh; - buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; + + buildInputs = [ + cmake gettext pkgconfig kdelibs gtk + ]; + meta = { description = "MPlayer front-end for KDE"; license = "GPL"; homepage = http://kmplayer.kde.org; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } From f305fe1c02b223463af9263a9800fc6b606527db Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 25 Jun 2013 07:32:04 +0800 Subject: [PATCH 2/2] kmplayer: minor fixes Wrap mplayer into PATH Remove unneeded dependency on gtk --- pkgs/applications/video/kmplayer/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 5f6c2259d1cb..553b86a3801e 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext -, kdelibs, gtk +{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper +, kdelibs, cairo, dbus_glib, mplayer }: stdenv.mkDerivation { @@ -11,9 +11,14 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake gettext pkgconfig kdelibs gtk + cmake gettext pkgconfig makeWrapper + kdelibs cairo dbus_glib ]; + postInstall = '' + wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin + ''; + meta = { description = "MPlayer front-end for KDE"; license = "GPL";