diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/zeroc-ice')
3 files changed, 13 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix index 13797f927c1c..dd983a34f883 100644 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/nixpkgs/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" diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index 9a69d3168c5d..e4d0c0fde174 100644 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -32,6 +32,8 @@ in stdenv.mkDerivation rec { buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ]; + prePatch = lib.optional stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ --replace xcrun "" diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/makefile.patch b/nixpkgs/pkgs/development/libraries/zeroc-ice/makefile.patch deleted file mode 100644 index 6955bcd0a6d7..000000000000 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/makefile.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,4 +77,6 @@ FreezeScript: Freeze - Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib - -+Glacier2: IceSSL -+ - IcePatch2: IcePatch2Lib - |