diff options
| author | Peter Simons <simons@cryp.to> | 2013-07-01 02:54:13 -0700 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-07-01 02:54:13 -0700 |
| commit | 2eb36d2a7a00b244c798598f61fdd4bd2dd22e48 (patch) | |
| tree | 98dbd23eba17b45dd25cf89191d5db725a799ebb /pkgs/applications/video | |
| parent | 6ce764bc82323c41ad67f8fc7e7529608fb13a56 (diff) | |
| parent | f305fe1c02b223463af9263a9800fc6b606527db (diff) | |
| download | nixlib-2eb36d2a7a00b244c798598f61fdd4bd2dd22e48.tar nixlib-2eb36d2a7a00b244c798598f61fdd4bd2dd22e48.tar.gz nixlib-2eb36d2a7a00b244c798598f61fdd4bd2dd22e48.tar.bz2 nixlib-2eb36d2a7a00b244c798598f61fdd4bd2dd22e48.tar.lz nixlib-2eb36d2a7a00b244c798598f61fdd4bd2dd22e48.tar.xz nixlib-2eb36d2a7a00b244c798598f61fdd4bd2dd22e48.tar.zst nixlib-2eb36d2a7a00b244c798598f61fdd4bd2dd22e48.zip | |
Merge pull request #669 from iyzsong/kmplayer
kmplayer: update to 0.11.3d
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/kmplayer/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/applications/video/kmplayer/default.nix | 25 |
2 files changed, 18 insertions, 16 deletions
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..553b86a3801e 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,17 +1,28 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: +{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper +, kdelibs, cairo, dbus_glib, mplayer +}: 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 makeWrapper + kdelibs cairo dbus_glib + ]; + + postInstall = '' + wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin + ''; + meta = { description = "MPlayer front-end for KDE"; license = "GPL"; homepage = http://kmplayer.kde.org; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } |