diff options
| author | Kranium Gikos Mendoza <kranium@gikos.net> | 2017-02-24 07:40:37 +1100 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-03-06 08:41:23 -0500 |
| commit | ac61ddef8ff6509549b0f8da588e668cadcf49bf (patch) | |
| tree | 06aa71b88637ed6be31d3272b20a2e0b8e4d499f /pkgs/servers/asterisk | |
| parent | d971a9bcca86389f0c9a4d9e52f0043fb07e819b (diff) | |
asterisk: use fetchsvn for vendored library
Diffstat (limited to 'pkgs/servers/asterisk')
| -rw-r--r-- | pkgs/servers/asterisk/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 0c9f72f66d5d..581dbc3b1f76 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,9 +1,8 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, +{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, binutils, newt, lua, speex, - srtp, wget, curl, - subversionClient + srtp, wget, curl }: let @@ -11,7 +10,7 @@ let inherit version; name = "asterisk-${version}"; - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl subversionClient ]; + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl ]; patches = [ # We want the Makefile to install the default /var skeleton @@ -36,7 +35,7 @@ let preConfigure = '' mkdir externals_cache '' + lib.concatStringsSep "\n" - (lib.mapAttrsToList (dst: src: "cp ${src} ${dst}") externals) + '' + (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals) + '' chmod -w externals_cache ''; @@ -50,7 +49,6 @@ let preBuild = '' make menuselect.makeopts substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" - ./contrib/scripts/get_mp3_source.sh ''; postInstall = '' @@ -71,6 +69,12 @@ let sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb"; }; + mp3-202 = fetchsvn { + url = http://svn.digium.com/svn/thirdparty/mp3/trunk; + rev = 202; + sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; + }; + in { @@ -79,6 +83,7 @@ in sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd"; externals = { "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "addons/mp3" = mp3-202; }; }; @@ -87,6 +92,7 @@ in sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj"; externals = { "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "addons/mp3" = mp3-202; }; }; |