From 04fcbefd81d6459675c84ce857e36dcb5f464057 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 13 Dec 2017 13:51:01 +0000 Subject: [PATCH] taglib: update cmake flags ASF and MP4 are enabled by default since 1.8 and not configurable in 1.9 and newer. TagLib 1.11 switched to building static libraries by default. --- pkgs/development/libraries/taglib/1.9.nix | 3 +-- pkgs/development/libraries/taglib/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 71b8a764eed..1caa8a376fb 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj"; }; - cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - nativeBuildInputs = [ cmake ]; meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index b038f133be7..be95cc760dc 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -8,10 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; }; - cmakeFlags = [ "-DWITH_ASF=ON" "-DWITH_MP4=ON" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { homepage = http://taglib.org/;