diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:11:01 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:08:12 -0500 |
commit | 2e0589b4ca8f43dbce3e5af91c6e4375681ebee5 (patch) | |
tree | e2b3b4f6ec45ed280d298363f3a40eb2a510f789 /pkgs/applications/audio/amarok | |
parent | dd264938bc1df93a66f7647d9ace267a241a3da7 (diff) | |
download | nixpkgs-2e0589b4ca8f43dbce3e5af91c6e4375681ebee5.tar nixpkgs-2e0589b4ca8f43dbce3e5af91c6e4375681ebee5.tar.gz nixpkgs-2e0589b4ca8f43dbce3e5af91c6e4375681ebee5.tar.bz2 nixpkgs-2e0589b4ca8f43dbce3e5af91c6e4375681ebee5.tar.lz nixpkgs-2e0589b4ca8f43dbce3e5af91c6e4375681ebee5.tar.xz nixpkgs-2e0589b4ca8f43dbce3e5af91c6e4375681ebee5.tar.zst nixpkgs-2e0589b4ca8f43dbce3e5af91c6e4375681ebee5.zip |
kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages' dependencies. On the Nixpkgs side, we no longer propagate the dependency on cmake (to reduce closure size), so downstream dependencies had to be adjusted for most packages that depend on kdelibs.
Diffstat (limited to 'pkgs/applications/audio/amarok')
-rw-r--r-- | pkgs/applications/audio/amarok/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 6ecdc1f98d4..d99e1b7a150 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl -, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs -, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon -, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null }: +{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig +, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib +, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod +, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null +}: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,9 +17,13 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl - libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + buildInputs = [ + qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib + taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2 + libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core + ]; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; |