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

Changed files
+37 -13
pkgs
development
libraries
spandsp
servers
sip
freeswitch
top-level
+24
pkgs/development/libraries/spandsp/3.nix
···
+
{ 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;
+
};
+
}
+10 -11
pkgs/development/libraries/spandsp/default.nix
···
-
{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
+
{stdenv, fetchurl, audiofile, libtiff}:
stdenv.mkDerivation rec {
-
version = "3.0.0";
+
version = "0.0.6";
pname = "spandsp";
-
src = fetchFromGitHub {
-
owner = "freeswitch";
-
repo = pname;
-
rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
-
sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
+
src=fetchurl {
+
url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
+
sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
};
outputs = [ "out" "dev" ];
-
nativeBuildInputs = [ autoreconfHook ];
-
propagatedBuildInputs = [ audiofile libtiff ];
-
+
propagatedBuildInputs = [audiofile libtiff];
meta = {
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;
maintainers = with stdenv.lib.maintainers; [raskin];
license = stdenv.lib.licenses.gpl2;
+
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
+
inherit version;
+
updateWalker = true;
};
}
+2 -2
pkgs/servers/sip/freeswitch/modules.nix
···
, ffmpeg
, libmysqlclient
, postgresql
-
, spandsp
+
, spandsp3
, sofia_sip
}:
···
snom = mk "applications/mod_snom" [];
sonar = mk "applications/mod_sonar" [];
soundtouch = mk "applications/mod_soundtouch" [];
-
spandsp = mk "applications/mod_spandsp" [ spandsp ];
+
spandsp = mk "applications/mod_spandsp" [ spandsp3 ];
spy = mk "applications/mod_spy" [];
stress = mk "applications/mod_stress" [];
translate = mk "applications/mod_translate" [];
+1
pkgs/top-level/all-packages.nix
···
soundtouch = callPackage ../development/libraries/soundtouch {};
spandsp = callPackage ../development/libraries/spandsp {};
+
spandsp3 = callPackage ../development/libraries/spandsp/3.nix {};
spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {};