diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-01-11 12:25:50 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2022-02-27 10:26:58 +0100 |
| commit | 6a977757e284b76468c7973f094eb99aa20b9251 (patch) | |
| tree | 50799e56be7a7df478cb3abd39d5c50a6d66c0f9 | |
| parent | 8ba95b68554d35faa422dec4a8bb201510e6686b (diff) | |
| download | nixpkgs-6a977757e284b76468c7973f094eb99aa20b9251.tar nixpkgs-6a977757e284b76468c7973f094eb99aa20b9251.tar.gz nixpkgs-6a977757e284b76468c7973f094eb99aa20b9251.tar.bz2 nixpkgs-6a977757e284b76468c7973f094eb99aa20b9251.tar.lz nixpkgs-6a977757e284b76468c7973f094eb99aa20b9251.tar.xz nixpkgs-6a977757e284b76468c7973f094eb99aa20b9251.tar.zst nixpkgs-6a977757e284b76468c7973f094eb99aa20b9251.zip | |
zeroc-ice: fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/163122463
| -rw-r--r-- | pkgs/development/libraries/zeroc-ice/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index fcd83634855..9a1861f6044 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -3,6 +3,7 @@ , darwin, libiconv, Security , python3 # for tests only , cpp11 ? false +, fetchpatch }: let @@ -32,6 +33,18 @@ in stdenv.mkDerivation rec { sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4"; }; + patches = [ + # Fixes for openssl 3.0 / glibc-2.34. + (fetchpatch { + url = "https://github.com/zeroc-ice/ice/commit/7204b31a082a10cd481c1f31dbb6184ec699160d.patch"; + sha256 = "sha256-RN8kQrvWRu1oXB7UV7DkYbZ8A0VyJYGArx6ikovwefo="; + }) + (fetchpatch { + url = "https://github.com/zeroc-ice/ice/commit/358e7fea00383d55d1c19d38a3bbb64aca803aeb.patch"; + sha256 = "sha256-ntrTO6qHB7dw398BRdAyJQUfVYW3iEfzUaBYoWWOEDs="; + }) + ]; + buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; |