diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index d99e1b7a150f..e0519f2db5c1 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core ]; + # This is already fixed upstream, will be release in 2.9 + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake + ''; + cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; propagatedUserEnvPkgs = [ qtscriptgenerator ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 2d399ba44da3..6906c7bccb5e 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -93,6 +93,11 @@ stdenv.mkDerivation rec { "-DENABLE_UDISKS2=ON" ]; + # This is already fixed upstream but not released yet. Maybe in version 2. + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake + ''; + postInstall = stdenv.lib.optionalString withQt5 '' wrapQtProgram "$out/bin/cantata" ''; diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 05fe67eb9d7b..623119703d4f 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -8,4 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ taglib ]; nativeBuildInputs = [ cmake ]; + + # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181 + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake + ''; }