Merge #109242: vorbis-tools: 1.4.0 -> 1.4.2

This commit is contained in:
Vladimír Čunát 2021-02-06 14:59:52 +01:00
commit cf8ad5efff
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 13 additions and 20 deletions

@ -1,26 +1,17 @@
{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl
, speex, flac }:
{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl
, speex, flac
, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "vorbis-tools";
version = "1.4.2";
let
debPatch = fetchzip {
url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz";
sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi";
};
in
stdenv.mkDerivation {
name = "vorbis-tools-1.4.0";
src = fetchurl {
url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz";
sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3";
url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz";
sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv";
};
postPatch = ''
for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir)
do patch -p1 < "$patch"
done
'';
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libogg libvorbis libao curl speex flac ];
meta = with lib; {

@ -25528,7 +25528,9 @@ in
volnoti = callPackage ../applications/misc/volnoti { };
vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
vorbis-tools = callPackage ../applications/audio/vorbis-tools {
autoreconfHook = buildPackages.autoreconfHook269;
};
vscode = callPackage ../applications/editors/vscode/vscode.nix { };