diff options
| author | Dima <dgoldin+github@protonmail.ch> | 2019-09-11 00:22:59 +0200 |
|---|---|---|
| committer | Dima <dgoldin+github@protonmail.ch> | 2019-09-11 00:28:03 +0200 |
| commit | cb966b6f7b91aa2b9e851729928a4f238c9b1d77 (patch) | |
| tree | b76e4a2063d15fc0202a52339f4ea71a7aaadc77 /pkgs/development/libraries/zeroc-ice | |
| parent | 70a0add412e920e13ca7994938a00906def0ebbd (diff) | |
| download | nixpkgs-cb966b6f7b91aa2b9e851729928a4f238c9b1d77.tar nixpkgs-cb966b6f7b91aa2b9e851729928a4f238c9b1d77.tar.gz nixpkgs-cb966b6f7b91aa2b9e851729928a4f238c9b1d77.tar.bz2 nixpkgs-cb966b6f7b91aa2b9e851729928a4f238c9b1d77.tar.lz nixpkgs-cb966b6f7b91aa2b9e851729928a4f238c9b1d77.tar.xz nixpkgs-cb966b6f7b91aa2b9e851729928a4f238c9b1d77.tar.zst nixpkgs-cb966b6f7b91aa2b9e851729928a4f238c9b1d77.zip | |
zeroc-ice-36: fix build for gcc8
The build was broken failing on unneccessary memsets. This issue was fixed upstream in 3.7 and discussed in https://github.com/zeroc-ice/ice/issues/82 The patch pertaining to the error causing the actual failure still applies nicely onto the 3.6 version. Hydra logs of breakage: https://hydra.nixos.org/build/100440955/nixlog/1
Diffstat (limited to 'pkgs/development/libraries/zeroc-ice')
| -rw-r--r-- | pkgs/development/libraries/zeroc-ice/3.6.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index 13797f927c1..dd983a34f88 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 +{ stdenv, lib, fetchFromGitHub, fetchpatch, mcpp, bzip2, expat, openssl, db5 , darwin, libiconv, Security , cpp11 ? false }: @@ -26,6 +26,16 @@ stdenv.mkDerivation rec { --replace xcrun "" ''; + 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; + }) + ]; + preBuild = '' makeFlagsArray+=( "prefix=$out" |