public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11947 from exi/taglib_extas-fix

Browse Source 
taglib-extras: make taglib-extras work with taglib > 1.9
This commit is contained in:
Peter Simons 2015-12-27 23:26:46 +01:00
commit 71e0a6ae4f
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/audio/amarok/default.nix
View File

@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core 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"; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
propagatedUserEnvPkgs = [ qtscriptgenerator ]; propagatedUserEnvPkgs = [ qtscriptgenerator ];

5
pkgs/applications/audio/cantata/default.nix
View File

@ -93,6 +93,11 @@ stdenv.mkDerivation rec {
"-DENABLE_UDISKS2=ON" "-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 '' postInstall = stdenv.lib.optionalString withQt5 ''
wrapQtProgram "$out/bin/cantata" wrapQtProgram "$out/bin/cantata"
''; '';

5
pkgs/development/libraries/taglib-extras/default.nix
View File

@ -8,4 +8,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ taglib ]; buildInputs = [ taglib ];
nativeBuildInputs = [ cmake ]; 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
'';
} }