zeroc-ice-36: remove, unmaintained
This commit is contained in:
parent
9a9fff59b2
commit
357dd9ed5f
@ -1,59 +0,0 @@
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
, mcpp, bzip2, expat, openssl, db5
|
||||
, darwin, libiconv, Security
|
||||
, zeroc-ice # to share meta
|
||||
, cpp11 ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zeroc-ice";
|
||||
version = "3.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroc-ice";
|
||||
repo = "ice";
|
||||
rev = "v${version}";
|
||||
sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15";
|
||||
};
|
||||
|
||||
buildInputs = [ mcpp bzip2 expat openssl db5 ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot=$sourceRoot/cpp
|
||||
'';
|
||||
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace config/Make.rules.Darwin \
|
||||
--replace xcrun ""
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fixes compilation warning about uninitialied variables (in test code)
|
||||
./uninitialized-variable-warning.patch
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(
|
||||
"prefix=$out"
|
||||
"OPTIMIZE=yes"
|
||||
"USR_DIR_INSTALL=yes"
|
||||
"CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}"
|
||||
"SKIP=slice2py" # provided by a separate package
|
||||
)
|
||||
'';
|
||||
|
||||
# cannot find -lIceXML (linking bin/transformdb)
|
||||
enableParallelBuilding = false;
|
||||
|
||||
outputs = [ "out" "bin" "dev" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $bin $dev/share
|
||||
mv $out/bin $bin
|
||||
mv $out/share/Ice-* $dev/share/ice
|
||||
rm -rf $out/share/slice
|
||||
'';
|
||||
|
||||
inherit (zeroc-ice) meta;
|
||||
}
|
@ -1,20 +0,0 @@
|
||||
diff --git a/test/Glacier2/dynamicFiltering/TestControllerI.h b/test/Glacier2/dynamicFiltering/TestControllerI.h
|
||||
index 7e21639..1279200 100644
|
||||
--- a/test/Glacier2/dynamicFiltering/TestControllerI.h
|
||||
+++ b/test/Glacier2/dynamicFiltering/TestControllerI.h
|
||||
@@ -21,13 +21,12 @@ struct SessionTuple
|
||||
{
|
||||
Glacier2::SessionPrx session;
|
||||
Glacier2::SessionControlPrx sessionControl;
|
||||
- bool configured;
|
||||
+ bool configured = false;
|
||||
|
||||
SessionTuple() {}
|
||||
SessionTuple(Glacier2::SessionPrx s, Glacier2::SessionControlPrx control):
|
||||
session(s),
|
||||
- sessionControl(control),
|
||||
- configured(false)
|
||||
+ sessionControl(control)
|
||||
{}
|
||||
|
||||
SessionTuple&
|
@ -1411,6 +1411,9 @@ mapAliases ({
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_git.libraries;
|
||||
});
|
||||
|
||||
# Added 2022-01-28
|
||||
zeroc-ice-36 = throw "Unmaintained, doesn't build w/glibc-2.34";
|
||||
|
||||
/* If these are in the scope of all-packages.nix, they cause collisions
|
||||
between mixed versions of qt. See:
|
||||
https://github.com/NixOS/nixpkgs/pull/101369 */
|
||||
|
@ -30174,10 +30174,6 @@ with pkgs;
|
||||
|
||||
zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
|
||||
|
||||
zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
zeronet = callPackage ../applications/networking/p2p/zeronet { };
|
||||
|
||||
zexy = callPackage ../applications/audio/pd-plugins/zexy {
|
||||
|
Loading…
Reference in New Issue
Block a user