Author: raskin
Date: Tue Jun 28 09:45:09 2011
New Revision: 27553
URL: https://svn.nixos.org/websvn/nix/?rev=27553&sc=1
Log:
Adding OneTeam XMPP client
Added:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/default.nix
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/oneteam/default.nix
Tue Jun 28 09:45:09 2011 (r27553)
@@ -0,0 +1,90 @@
+x@{builderDefsPackage
+ , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
+ , pulseaudio, gtkLibs, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ ["fetchgit" "perlPackages" "gtkLibs"];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [
+ a.perlPackages.SubName a.gtkLibs.gtk a.gtkLibs.glib
+ ];
+ sourceInfo = rec {
+ baseName="oneteam";
+ version="git-head";
+ name="${baseName}-${version}";
+ url="git://git.process-one.net/oneteam/oneteam.git";
+ rev="066cd861ea4436bbe363f032c58a746a1cac7498";
+ hash="972310d6ef20db7dc749d7d935aa50889afe2004db2a07409830e09ef639f30a";
+ method="fetchgit";
+ };
+in
+rec {
+ srcDrv = a.fetchgit {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ rev = sourceInfo.rev;
+ };
+
+ src=srcDrv + "/";
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["goComponents" "setVars" "fixComponents" "doCmake"
+ "doMakeInstall" "goBack" "buildApp" "doDeploy"];
+
+ fixComponents = a.fullDepEntry ''
+ sed -e '1i#include <netinet/in.h>' -i src/rtp/otRTPDecoder.cpp
src/rtp/otRTPEncoder.cpp
+ '' ["minInit" "doUnpack"];
+
+ setVars=a.noDepEntry ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+ '';
+
+ cmakeBuildDir="cmake-build";
+ cmakeFlags=["-D
XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
+
+ goComponents=a.fullDepEntry "cd src/components" ["doUnpack"];
+ goBack=a.noDepEntry "cd ../../..";
+
+ buildApp=a.fullDepEntry ''
+ perl build.pl XULAPP 1
+ '' ["addInputs"];
+
+ doDeploy = a.fullDepEntry ''
+ TARGET_DIR="$out/share/oneteam/app"
+ BUILD_DIR="$PWD"
+ ensureDir "$TARGET_DIR"
+ cd "$TARGET_DIR"
+ unzip "$BUILD_DIR/oneteam.xulapp"
+ ensureDir "$out/bin"
+ echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam"
+ echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" >
"$out/bin/oneteam"
+ chmod a+x "$out/bin/oneteam"
+ ensureDir "$out/share/doc"
+ cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
+ '' ["defEnsureDir"];
+
+ meta = {
+ description = "An XMPP client";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.gpl2;
+ homepage="http://oneteam.im";;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "git://git.process-one.net/oneteam/oneteam.git";
+ };
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Mon Jun
27 21:43:06 2011 (r27552)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Tue Jun
28 09:45:09 2011 (r27553)
@@ -396,9 +396,11 @@
cmakeRPathFlag = if (attrByPath ["cmakeSkipRpath "] true args) then "
-DCMAKE_SKIP_BUILD_RPATH=ON " else "";
+ cmakeBuildDir = attrByPath ["cmakeBuildDir"] "build" args;
+
doCmake = fullDepEntry (''
- mkdir build
- cd build
+ mkdir ${cmakeBuildDir}
+ cd ${cmakeBuildDir}
cmake -D CMAKE_INSTALL_PREFIX="$out" ${cmakeRPathFlag}${toString
cmakeFlags} ..
'') ["minInit" "addInputs" "doUnpack"];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jun 27 21:43:06
2011 (r27552)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jun 28 09:45:09
2011 (r27553)
@@ -6745,6 +6745,8 @@
offrss = callPackage ../applications/networking/offrss { };
+ oneteam = callPackage ../applications/networking/instant-messengers/oneteam
{};
+
openbox = callPackage ../applications/window-managers/openbox { };
openjump = callPackage ../applications/misc/openjump { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
