From 72d0f85dd2686451cba933e9e7dd72a89cf10e0c Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Mon, 28 Sep 2020 18:08:55 +0200 Subject: [PATCH] zeroc-mcpp: decouple from original mcpp zeroc-ice used to smuggle a forked mcpp version in with an override, which broke after applying a security patch against mcpp in c60cafa719ba22772114f4c35df14fb18f66a66f. Overriding instead of defining a new derivation is a questionable optimization since in fact, only the 'configureFlags' line is shared. Remove the override and give the forked mcpp a live on its own. The security patch for mcpp is not relevant for this fork. Fix #98581 --- pkgs/development/libraries/zeroc-ice/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 9c9c5a6b001..2fb36c0aea5 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, lmdb +{ stdenv, lib, fetchFromGitHub, bzip2, expat, openssl, lmdb , darwin, libiconv, Security , cpp11 ? false }: let - zeroc_mcpp = mcpp.overrideAttrs (self: rec { + zeroc_mcpp = stdenv.mkDerivation rec { pname = "zeroc-mcpp"; version = "2.7.2.14"; @@ -15,8 +15,9 @@ let sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh"; }; + configureFlags = [ "--enable-mcpplib" ]; installFlags = [ "PREFIX=$(out)" ]; - }); + }; in stdenv.mkDerivation rec { pname = "zeroc-ice"; @@ -63,7 +64,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.zeroc.com/ice.html"; + homepage = "https://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix;