Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4241a7f1b851
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27f10869e295
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 7, 2019

  1. taglib: fix ogg file corruption (#68088)

    @peterhoeg @zimbatm
    peterhoeg authored and zimbatm committed Sep 7, 2019
    Copy the full SHA
    27f1086 View commit details
Showing with 15 additions and 5 deletions.
  1. +15 −5 pkgs/development/libraries/taglib/default.nix
20 changes: 15 additions & 5 deletions pkgs/development/libraries/taglib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{stdenv, fetchurl, zlib, cmake, fetchpatch}:
{ stdenv, fetchurl, cmake, fetchpatch
, zlib
}:

stdenv.mkDerivation rec {
name = "taglib-1.11.1";
pname = "taglib";
version = "1.11.1";

src = fetchurl {
url = "http://taglib.org/releases/${name}.tar.gz";
url = "http://taglib.org/releases/${pname}-${version}.tar.gz";
sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn";
};

@@ -22,6 +25,13 @@ stdenv.mkDerivation rec {
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 ];
@@ -31,8 +41,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];

meta = with stdenv.lib; {
homepage = http://taglib.org/;
repositories.git = git://github.com/taglib/taglib.git;
homepage = "http://taglib.org/";
repositories.git = "git://github.com/taglib/taglib.git";
description = "A library for reading and editing audio file metadata.";
longDescription = ''
TagLib is a library for reading and editing the meta-data of several