Author: raskin
Date: Tue Jun 7 14:42:24 2011
New Revision: 27364
URL: https://svn.nixos.org/websvn/nix/?rev=27364&sc=1
Log:
Adding GSM and CELT codecs; dependencies of sflphone - failed to buuild itself
Added:
nixpkgs/trunk/pkgs/development/libraries/celt/
nixpkgs/trunk/pkgs/development/libraries/celt/0.7.nix
nixpkgs/trunk/pkgs/development/libraries/celt/default.nix
nixpkgs/trunk/pkgs/development/libraries/gsm/
nixpkgs/trunk/pkgs/development/libraries/gsm/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/celt/0.7.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/celt/0.7.nix Tue Jun 7
14:42:24 2011 (r27364)
@@ -0,0 +1,47 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="celt";
+ version="0.7.1";
+ name="${baseName}-${version}";
+ url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz";;
+ hash="93f0e2dfb59021b19e69dc0dee855eb89f19397db1dea0d0d6f9329cff933066";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "CELT - low-delay audio codec";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = "free";
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.celt-codec.org/downloads/";;
+ };
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/development/libraries/celt/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/celt/default.nix Tue Jun 7
14:42:24 2011 (r27364)
@@ -0,0 +1,47 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="celt";
+ version="0.11.1";
+ name="${baseName}-${version}";
+ url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz";;
+ hash="1gsc3pxydyzzra8w0r6hrrsalm76lrq4lw6bd283qa4bpagmghh1";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "CELT - low-delay audio codec";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = "free";
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.celt-codec.org/downloads/";;
+ };
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/development/libraries/gsm/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/gsm/default.nix Tue Jun 7
14:42:24 2011 (r27364)
@@ -0,0 +1,60 @@
+x@{builderDefsPackage
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="gsm";
+ version="1.0.13";
+ name="${baseName}-${version}";
+ url="http://www.quut.com/gsm/${name}.tar.gz";;
+ hash="1bcjl2h60gvr1dc5a963h3vnz9zl6n8qrfa3qmb2x3229lj1iiaj";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["createDirs" "setVars" "doMakeInstall"];
+
+ createDirs = a.fullDepEntry ''
+ ensureDir "$out/"{bin,lib,share/man,share/info,include/gsm}
+ '' ["minInit" "defEnsureDir"];
+
+ setVars = a.noDepEntry ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+ '';
+
+ makeFlags = [
+ ''INSTALL_ROOT="$out"''
+ ''GSM_INSTALL_INC="$out/include/gsm"''
+ ];
+
+ meta = {
+ description = "A GSM codec library";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = "free-noncopyleft";
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.quut.com/gsm/";;
+ };
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 7 14:23:01
2011 (r27363)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 7 14:42:24
2011 (r27364)
@@ -2907,6 +2907,9 @@
ccrtp = callPackage ../development/libraries/ccrtp { };
ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { };
+ celt = callPackage ../development/libraries/celt {};
+ celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
+
cgui = callPackage ../development/libraries/cgui {};
check = callPackage ../development/libraries/check { };
@@ -3294,6 +3297,8 @@
gsl = callPackage ../development/libraries/gsl { };
+ gsm = callPackage ../development/libraries/gsm {};
+
gsoap = callPackage ../development/libraries/gsoap { };
gss = callPackage ../development/libraries/gss { };
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
