swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

zeroc-ice-36: fix build for gcc8

Browse source 
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
This commit is contained in:
Dima 2019-09-11 00:22:59 +02:00
parent 70a0add412
commit cb966b6f7b
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/zeroc-ice/3.6.nix
View file

@ -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"