diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:18:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:25:38 +0200 |
| commit | 7a005601d48f760864258e369364b3b847d4e9fd (patch) | |
| tree | fb562597c59110eb319e9cd8f484280fcf587433 /pkgs/applications/audio/amarok/default.nix | |
| parent | 7d7a9df3605c86e17bced51afe67eecd43f99754 (diff) | |
| parent | df310048e5f4a516663bf8c5a74029b54813a7f3 (diff) | |
| download | nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.gz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.bz2 nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.lz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.xz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.zst nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.zip | |
Merge branch 'master' to resolve conflicts
Diffstat (limited to 'pkgs/applications/audio/amarok/default.nix')
| -rw-r--r-- | pkgs/applications/audio/amarok/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index aec2768e450..f7097442744 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -2,7 +2,7 @@ , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib , taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null -, lz4, lzo, snappy, libaio +, lz4, lzo, snappy, libaio, pcre }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 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 - lz4 lzo snappy libaio + lz4 lzo snappy libaio pcre ]; # This is already fixed upstream, will be release in 2.9 |