diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-11-18 17:15:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-18 17:15:21 +0100 |
commit | 6625284c397b44bc9518a5a1567c1b5aae455c08 (patch) | |
tree | e89c500a241f8488c640a5a80e75f7b037766524 | |
parent | f2e4de720d80775eb198b252f0f31af6cbcce99e (diff) | |
parent | 19ddb6e657d008c15ae37157bc68fb06e57fc865 (diff) |
Merge pull request #104182 from helsinki-systems/fix/gst-plugins-bad
-rw-r--r-- | pkgs/development/libraries/spandsp/3.nix | 24 | ||||
-rw-r--r-- | pkgs/development/libraries/spandsp/default.nix | 21 | ||||
-rw-r--r-- | pkgs/servers/sip/freeswitch/modules.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
4 files changed, 37 insertions, 13 deletions
diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix new file mode 100644 index 000000000000..ac587f0492b0 --- /dev/null +++ b/pkgs/development/libraries/spandsp/3.nix @@ -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; + }; +} diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 92a6f66d6364..1f9834c08f47 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,24 +1,23 @@ -{ 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; }; } diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix index 226ad90ee1f5..202461d2cf9f 100644 --- a/pkgs/servers/sip/freeswitch/modules.nix +++ b/pkgs/servers/sip/freeswitch/modules.nix @@ -9,7 +9,7 @@ , ffmpeg , libmysqlclient , postgresql -, spandsp +, spandsp3 , sofia_sip }: @@ -70,7 +70,7 @@ in 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" []; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2efe9633b92..6ae76b9242d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15794,6 +15794,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.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 {}; |