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

zeroc-ice: fix build w/glibc-2.34

Browse Source 
Failing Hydra build: https://hydra.nixos.org/build/163122463
This commit is contained in:
Maximilian Bosch 2022-01-11 12:25:50 +01:00
parent 8ba95b6855
commit 6a977757e2
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/zeroc-ice/default.nix
View File

@ -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 ];