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

zeroc-mcpp: decouple from original mcpp

Browse Source 
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
This commit is contained in:
Christian Kauhaus 2020-09-28 18:08:55 +02:00
parent 1e510a65a3
commit 72d0f85dd2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, lmdb { stdenv, lib, fetchFromGitHub, bzip2, expat, openssl, lmdb
, darwin, libiconv, Security , darwin, libiconv, Security
, cpp11 ? false , cpp11 ? false
}: }:
let let
zeroc_mcpp = mcpp.overrideAttrs (self: rec { zeroc_mcpp = stdenv.mkDerivation rec {
pname = "zeroc-mcpp"; pname = "zeroc-mcpp";
version = "2.7.2.14"; version = "2.7.2.14";
@ -15,8 +15,9 @@ let
sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh"; sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh";
}; };
configureFlags = [ "--enable-mcpplib" ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
}); };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "zeroc-ice"; pname = "zeroc-ice";
@ -63,7 +64,7 @@ in stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://www.zeroc.com/ice.html"; homepage = "https://www.zeroc.com/ice.html";
description = "The internet communications engine"; description = "The internet communications engine";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;