JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #68461 from d-goldin/zeroc-ice-36-fix-gcc8

Browse Source 
zeroc-ice-36: fix build for gcc8
This commit is contained in:
worldofpeace 2019-09-12 12:48:50 -04:00 committed by GitHub
commit b9a738d613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 , darwin, libiconv, Security
, cpp11 ? false , cpp11 ? false
}: }:
@ -26,6 +26,16 @@ stdenv.mkDerivation rec {
--replace xcrun "" --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 = '' preBuild = ''
makeFlagsArray+=( makeFlagsArray+=(
"prefix=$out" "prefix=$out"