Skip to content

Commit

Permalink
python3Packages.libarcus: fix build against protobuf 3.18+
Browse files Browse the repository at this point in the history
Still needs upstream resolution,
but we can grab a Vcpkg patch in the meantime
  • Loading branch information
r-burns committed Sep 23, 2021
1 parent 78ca5a3 commit d9eefb5
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkgs/development/python-modules/libarcus/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, buildPythonPackage, python, fetchFromGitHub
, fetchpatch
, cmake, sip_4, protobuf, pythonOlder }:

buildPythonPackage rec {
Expand All @@ -13,7 +14,16 @@ buildPythonPackage rec {
sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf";
};

disabled = pythonOlder "3.4.0";
patches = [
# Fix build against protobuf 3.18+
# https://github.com/Ultimaker/libArcus/issues/121
(fetchpatch {
url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch";
sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2";
})
];

disabled = pythonOlder "3.4";

propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ];
Expand Down

0 comments on commit d9eefb5

Please sign in to comment.