From 2be13a1e8bac2ebd66e45aecb68e4ea13d1fd224 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 Feb 2022 06:10:35 -0800
Subject: [PATCH] omniorb: 4.2.4 -> 4.3.0

* omniorb: 4.2.4 -> 4.3.0 (#159693)

* omniorb: use Python 3.x
shorten meta.description
move the rest to meta.longDescription
add LGPL-2.1+ to meta.licenses (used by libs)
enable parallel building

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
---
 pkgs/development/tools/omniorb/default.nix | 27 ++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 74341c0a7b4..4acf2264fc9 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -1,23 +1,36 @@
-{ lib, stdenv, fetchurl, python2 }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, python3
+}:
+
 stdenv.mkDerivation rec {
 
   pname = "omniorb";
-
-  version = "4.2.4";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
-    sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18";
+    hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0=";
   };
 
-  buildInputs = [ python2 ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ python3 ];
 
+  enableParallelBuilding = true;
   hardeningDisable = [ "format" ];
 
   meta = with lib; {
-    description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
+    description = "A robust high performance CORBA ORB for C++ and Python";
+    longDescription = ''
+      omniORB is a robust high performance CORBA ORB for C++ and Python.
+      It is freely available under the terms of the GNU Lesser General Public License
+      (for the libraries),and GNU General Public License (for the tools).
+      omniORB is largely CORBA 2.6 compliant.
+    '';
     homepage    = "http://omniorb.sourceforge.net/";
-    license     = licenses.gpl2Plus;
+    license     = with licenses; [ gpl2Plus lgpl21Plus ];
     maintainers = with maintainers; [ smironov ];
     platforms   = platforms.unix;
   };