mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-03 02:33:15 +00:00
Merge pull request #290836 from panicgh/fastcdr
fastcdr: 2.1.3 -> 2.2.0
This commit is contained in:
commit
c6377cea0d
@ -10,27 +10,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastcdr";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-CDR";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eSf6LNTVsGEBXjTmTBjjWKBqs68pbnVcw1p2bi1Asgg=";
|
||||
hash = "sha256-hhYNgBLJCTZV/fgHEH7rxlTy+qpShAykxHLbPtPA/Uw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Do-not-require-wget-and-unzip.patch
|
||||
];
|
||||
|
||||
# Fix doc generation error with doxygen >= 1.10.0
|
||||
# see https://github.com/eProsima/Fast-CDR/issues/193
|
||||
postPatch = ''
|
||||
substituteInPlace ./doxyfile.in --replace \
|
||||
"WARN_AS_ERROR = YES" \
|
||||
"WARN_AS_ERROR = NO"
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF"
|
||||
# upstream turns BUILD_TESTING=OFF by default and doesn't honor cmake's default (=ON)
|
||||
++ lib.optional (finalAttrs.finalPackage.doCheck) "-DBUILD_TESTING=ON"
|
@ -21041,8 +21041,6 @@ with pkgs;
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
fastcdr = callPackage ../development/libraries/fastcdr { };
|
||||
|
||||
fbthrift = callPackage ../development/libraries/fbthrift { };
|
||||
|
||||
fb303 = callPackage ../development/libraries/fb303 { };
|
||||
|
Loading…
Reference in New Issue
Block a user