diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 9ee55a47797..b60168a6f5c 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -1,9 +1,7 @@ { stdenv, lib, fetchFromGitHub , bzip2, expat, libedit, lmdb, openssl -, darwin, libiconv, Security , python3 # for tests only , cpp11 ? false -, fetchpatch }: let @@ -24,36 +22,16 @@ let in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4"; + sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g="; }; - 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 ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Make.rules.Darwin \ - --replace xcrun "" - ''; + buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ]; preBuild = '' makeFlagsArray+=( @@ -97,7 +75,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; - # no match for 'operator!=' - broken = true; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f9c35a9e11..becfac7963a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30892,9 +30892,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = callPackage ../development/libraries/zeroc-ice { - inherit (darwin.apple_sdk.frameworks) Security; - }; + zeroc-ice = callPackage ../development/libraries/zeroc-ice {}; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };