nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-24 14:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

zeroc-ice: 3.6.3 -> 3.6.5, 3.7.2 -> 3.7.6

Browse Source 
3.7 now has a dependency on libedit.
This commit is contained in:
Harrison Houghton 2021-08-09 21:40:48 -04:00
parent 39d2d3a288
commit 9608f26acf
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/zeroc-ice/3.6.nix
View File

@ -1,17 +1,18 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, mcpp, bzip2, expat, openssl, db5
{ stdenv, lib, fetchFromGitHub
, mcpp, bzip2, expat, openssl, db5
, darwin, libiconv, Security
, cpp11 ? false
}:
stdenv.mkDerivation rec {
pname = "zeroc-ice";
version = "3.6.3";
version = "3.6.5";
src = fetchFromGitHub {
owner = "zeroc-ice";
repo = "ice";
rev = "v${version}";
sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15";
};
buildInputs = [ mcpp bzip2 expat openssl db5 ]
@ -27,13 +28,6 @@ stdenv.mkDerivation rec {
'';
patches = [
# Fixes compilation issues with GCC 8 using one of the patches
# provided in https://github.com/zeroc-ice/ice/issues/82
( fetchpatch {
url = "https://github.com/zeroc-ice/ice/commit/a6a4981616b669432ff7b588179d6e93694d9e3f.patch";
sha256 = "17j5r7gsa3izrm7zln4mrp7l16h532gvmpas0kzglybicbiz7d56";
stripLen = 1;
})
# Fixes compilation warning about uninitialied variables (in test code)
./uninitialized-variable-warning.patch
];

9
pkgs/development/libraries/zeroc-ice/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, lib, fetchFromGitHub, bzip2, expat, openssl, lmdb
{ stdenv, lib, fetchFromGitHub
, bzip2, expat, libedit, lmdb, openssl
, darwin, libiconv, Security
, cpp11 ? false
}:
@ -21,16 +22,16 @@ let
in stdenv.mkDerivation rec {
pname = "zeroc-ice";
version = "3.7.2";
version = "3.7.6";
src = fetchFromGitHub {
owner = "zeroc-ice";
repo = "ice";
rev = "v${version}";
sha256 = "0m9lh79dfpcwcp2jhmj0wqdcsw3rl633x2hzfw9n2i34jjv64fvg";
sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4";
};
buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ]
buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy";