Merge pull request #122955 from peterhoeg/u/taglib_1_12

taglib: 1.11.1 -> 1.12

Changed files
+10 -33
pkgs
applications
audio
strawberry
development
libraries
taglib
-4
pkgs/applications/audio/strawberry/default.nix
···
util-linux
];
-
cmakeFlags = [
-
"-DUSE_SYSTEM_TAGLIB=ON"
-
];
-
postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
'';
+10 -29
pkgs/development/libraries/taglib/default.nix
···
-
{ lib, stdenv, fetchurl, cmake, fetchpatch
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, cmake
, zlib
}:
stdenv.mkDerivation rec {
pname = "taglib";
-
version = "1.11.1";
+
version = "1.12";
-
src = fetchurl {
-
url = "http://taglib.org/releases/${pname}-${version}.tar.gz";
-
sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn";
+
src = fetchFromGitHub {
+
owner = "taglib";
+
repo = "taglib";
+
rev = "v${version}";
+
sha256 = "sha256-omErajnYgxbflsbe6pS2KsexZcXisso0WGYnmIud7WA=";
};
-
patches = [
-
(fetchpatch {
-
# https://github.com/taglib/taglib/issues/829
-
name = "CVE-2017-12678.patch";
-
url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch";
-
sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90";
-
})
-
-
(fetchpatch {
-
# https://github.com/taglib/taglib/pull/869
-
name = "CVE-2018-11439.patch";
-
url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";
-
sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72";
-
})
-
-
(fetchpatch {
-
# many consumers of taglib have started vendoring taglib due to this bug
-
name = "fix_ogg_corruption.patch";
-
url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch";
-
sha256 = "01wlwk4gmfxdg5hjj9jmrain7kia89z0zsdaf5gn3nibmy5bq70r";
-
})
-
];
-
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ];
···
Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files.
'';
license = with licenses; [ lgpl3 mpl11 ];
-
inherit (cmake.meta) platforms;
maintainers = with maintainers; [ ttuegel ];
};
}