diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-03-09 20:16:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-09 20:16:30 +0000 |
| commit | 4241c2d69154ae979e3dd79dc7cd77784f53fdd2 (patch) | |
| tree | fb397717481d34922789ee55405deac4972a1681 /pkgs/development/libraries/spandsp | |
| parent | 6d1fadff21a88aa588c4d59ed06dd7a888b6e7a4 (diff) | |
| parent | 6b0e09670d4b0edb7ac3d24503a2a9a5a081dc5a (diff) | |
| download | nixpkgs-4241c2d69154ae979e3dd79dc7cd77784f53fdd2.tar nixpkgs-4241c2d69154ae979e3dd79dc7cd77784f53fdd2.tar.gz nixpkgs-4241c2d69154ae979e3dd79dc7cd77784f53fdd2.tar.bz2 nixpkgs-4241c2d69154ae979e3dd79dc7cd77784f53fdd2.tar.lz nixpkgs-4241c2d69154ae979e3dd79dc7cd77784f53fdd2.tar.xz nixpkgs-4241c2d69154ae979e3dd79dc7cd77784f53fdd2.tar.zst nixpkgs-4241c2d69154ae979e3dd79dc7cd77784f53fdd2.zip | |
Merge pull request #218477 from amjoseph-nixpkgs/pr/spandsp/fix-cross2
spandsp: fix cross compilation
Diffstat (limited to 'pkgs/development/libraries/spandsp')
| -rw-r--r-- | pkgs/development/libraries/spandsp/3.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/spandsp/default.nix | 15 |
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index ceb53e05744..92af122386f 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook +, fetchpatch +, buildPackages }: stdenv.mkDerivation rec { version = "3.0.0"; pname = "spandsp"; @@ -9,11 +11,24 @@ stdenv.mkDerivation rec { sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7"; }; + patches = [ + # submitted upstream: https://github.com/freeswitch/spandsp/pull/47 + (fetchpatch { + url = "https://github.com/freeswitch/spandsp/commit/1f810894804d3fa61ab3fc2f3feb0599145a3436.patch"; + hash = "sha256-Cf8aaoriAvchh5cMb75yP2gsZbZaOLha/j5mq3xlkVA="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ audiofile libtiff ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc" + ]; + meta = { description = "A portable and modular SIP User-Agent with audio and video support"; homepage = "https://github.com/freeswitch/spandsp"; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 2c96e60c6d3..b7fa9388e75 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,7 +1,19 @@ -{ lib, stdenv, fetchurl, audiofile, libtiff, buildPackages }: +{ lib, stdenv, fetchurl, audiofile, libtiff, buildPackages +, fetchpatch +, autoreconfHook }: + stdenv.mkDerivation rec { version = "0.0.6"; pname = "spandsp"; + + patches = [ + # submitted upstream: https://github.com/freeswitch/spandsp/pull/47 + (fetchpatch { + url = "https://github.com/freeswitch/spandsp/commit/1f810894804d3fa61ab3fc2f3feb0599145a3436.patch"; + hash = "sha256-Cf8aaoriAvchh5cMb75yP2gsZbZaOLha/j5mq3xlkVA="; + }) + ]; + src=fetchurl { url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; @@ -21,6 +33,7 @@ stdenv.mkDerivation rec { ]; strictDeps = true; + nativeBuildInputs = [ autoreconfHook ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; propagatedBuildInputs = [audiofile libtiff]; meta = { |