diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 20:06:21 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-23 20:06:21 +0000 |
| commit | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (patch) | |
| tree | c393d2e331ff60908a2e00727fa4d2b852e85d3b /pkgs/development/libraries/phonon | |
| parent | 79232c5f54c47e8359262601243d2878e2ab5512 (diff) | |
| parent | 65e7aeda65e30ceb44c6d8773bbf69dd122bd9c9 (diff) | |
| download | nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.gz nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.bz2 nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.lz nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.xz nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.zst nixpkgs-38e3d7bc86d2a48dd4d653fd3f142f422c075563.zip | |
svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you please look at this? svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
Diffstat (limited to 'pkgs/development/libraries/phonon')
| -rw-r--r-- | pkgs/development/libraries/phonon/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index c7de1df7190..2c70957746d 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4 }: +{ stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: let - v = "4.5.1"; + v = "4.6.0"; in stdenv.mkDerivation rec { @@ -9,20 +9,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz"; - sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001"; + sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qt4 pulseaudio ]; buildNativeInputs = [ cmake automoc4 ]; - cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs"; - preConfigure = - '' - substituteInPlace designer/CMakeLists.txt \ - --replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins' - ''; - meta = { homepage = http://phonon.kde.org/; description = "Multimedia API for Qt"; |