From 5303351c72b725b2138daa87ef4f852dd826bdd2 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Fri, 25 Dec 2015 13:56:26 +0100 Subject: [PATCH 1/4] make taglib-extras work with taglib > 1.9 --- pkgs/development/libraries/taglib-extras/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 05fe67eb9d7..1edabe4c81f 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -8,4 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ taglib ]; nativeBuildInputs = [ cmake ]; + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake + ''; } From 4400f01c0bb2630e4ff175024e05d2b171c2782b Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Sat, 26 Dec 2015 18:00:20 +0100 Subject: [PATCH 2/4] amarok: fix taglib search --- pkgs/applications/audio/amarok/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index d99e1b7a150..95f55abddba 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core ]; + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake + ''; + cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; propagatedUserEnvPkgs = [ qtscriptgenerator ]; From a25de32033e22ba9d70c813b81f6acd43d3f794e Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Sat, 26 Dec 2015 18:00:32 +0100 Subject: [PATCH 3/4] cantata: fix taglib search --- pkgs/applications/audio/cantata/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 2d399ba44da..c3b4e60b87c 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -93,6 +93,10 @@ stdenv.mkDerivation rec { "-DENABLE_UDISKS2=ON" ]; + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake + ''; + postInstall = stdenv.lib.optionalString withQt5 '' wrapQtProgram "$out/bin/cantata" ''; From e94139f8c8a5e4c56ae7868e2348af47c4955a58 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Sat, 26 Dec 2015 18:42:03 +0100 Subject: [PATCH 4/4] Add comments identifying workarounds --- pkgs/applications/audio/amarok/default.nix | 1 + pkgs/applications/audio/cantata/default.nix | 1 + pkgs/development/libraries/taglib-extras/default.nix | 2 ++ 3 files changed, 4 insertions(+) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 95f55abddba..e0519f2db5c 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -25,6 +25,7 @@ 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 ''; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index c3b4e60b87c..6906c7bccb5 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -93,6 +93,7 @@ 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 ''; diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 1edabe4c81f..623119703d4 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -8,6 +8,8 @@ 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 '';