Merge pull request #11947 from exi/taglib_extas-fix

taglib-extras: make taglib-extras work with taglib > 1.9

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 ];

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"
   '';

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
+  '';
 }