Merge pull request #104182 from helsinki-systems/fix/gst-plugins-bad

This commit is contained in:
Jörg Thalheim 2020-11-18 17:15:21 +01:00 committed by GitHub
commit 6625284c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 13 deletions

View File

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
stdenv.mkDerivation rec {
version = "3.0.0";
pname = "spandsp";
src = fetchFromGitHub {
owner = "freeswitch";
repo = pname;
rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook ];
propagatedBuildInputs = [ audiofile libtiff ];
meta = {
description = "A portable and modular SIP User-Agent with audio and video support";
homepage = "https://github.com/freeswitch/spandsp";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ ajs124 ];
license = stdenv.lib.licenses.gpl2;
};
}

View File

@ -1,24 +1,23 @@
{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }: {stdenv, fetchurl, audiofile, libtiff}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.0"; version = "0.0.6";
pname = "spandsp"; pname = "spandsp";
src = fetchFromGitHub { src=fetchurl {
owner = "freeswitch"; url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
repo = pname; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [audiofile libtiff];
propagatedBuildInputs = [ audiofile libtiff ];
meta = { meta = {
description = "A portable and modular SIP User-Agent with audio and video support"; description = "A portable and modular SIP User-Agent with audio and video support";
homepage = "https://github.com/freeswitch/spandsp"; homepage = "http://www.creytiv.com/baresip.html";
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [raskin]; maintainers = with stdenv.lib.maintainers; [raskin];
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
inherit version;
updateWalker = true;
}; };
} }

View File

@ -9,7 +9,7 @@
, ffmpeg , ffmpeg
, libmysqlclient , libmysqlclient
, postgresql , postgresql
, spandsp , spandsp3
, sofia_sip , sofia_sip
}: }:
@ -70,7 +70,7 @@ in
snom = mk "applications/mod_snom" []; snom = mk "applications/mod_snom" [];
sonar = mk "applications/mod_sonar" []; sonar = mk "applications/mod_sonar" [];
soundtouch = mk "applications/mod_soundtouch" []; soundtouch = mk "applications/mod_soundtouch" [];
spandsp = mk "applications/mod_spandsp" [ spandsp ]; spandsp = mk "applications/mod_spandsp" [ spandsp3 ];
spy = mk "applications/mod_spy" []; spy = mk "applications/mod_spy" [];
stress = mk "applications/mod_stress" []; stress = mk "applications/mod_stress" [];
translate = mk "applications/mod_translate" []; translate = mk "applications/mod_translate" [];

View File

@ -15794,6 +15794,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
soundtouch = callPackage ../development/libraries/soundtouch {}; soundtouch = callPackage ../development/libraries/soundtouch {};
spandsp = callPackage ../development/libraries/spandsp {}; spandsp = callPackage ../development/libraries/spandsp {};
spandsp3 = callPackage ../development/libraries/spandsp/3.nix {};
spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {}; spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {};