diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:28:29 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:30:53 +0200 |
commit | 625f40151b0767cb421999cf988f4eb7bcf8b63d (patch) | |
tree | 629565f6f9efb26ad36b2a6d8e7e266290feb94b /pkgs/desktops/gnome-2/platform/ORBit2/default.nix | |
parent | d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 (diff) | |
parent | 4fb87e91ffcbf6f6785e32b7e608198401a7155d (diff) | |
download | nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.gz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.bz2 nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.lz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.xz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.zst nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.zip |
Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/desktops/gnome-2/platform/ORBit2/default.nix')
-rw-r--r-- | pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 22c22c6bcf50..94aaf30a49dd 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl_gnome, pkgconfig, glib, libIDL}: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libIDL, libintlOrEmpty }: stdenv.mkDerivation rec { name = src.pkgname; @@ -14,5 +14,24 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libIDL ]; + propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + + meta = with stdenv.lib; { + homepage = https://projects.gnome.org/ORBit2/; + description = "A a CORBA 2.4-compliant Object Request Broker"; + platforms = platforms.unix; + maintainers = with maintainers; [ lovek323 ]; + + longDescription = '' + ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB) featuring + mature C, C++ and Python bindings. Bindings (in various degrees of + completeness) are also available for Perl, Lisp, Pascal, Ruby, and TCL; + others are in-progress. It supports POA, DII, DSI, TypeCode, Any, IR and + IIOP. Optional features including INS and threading are available. ORBit2 + is engineered for the desktop workstation environment, with a focus on + performance, low resource usage, and security. The core ORB is written in + C, and runs under Linux, UNIX (BSD, Solaris, HP-UX, ...), and Windows. + ORBit2 is developed and released as open source software under GPL/LGPL. + ''; + }; } |