b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #138565 from r-burns/libarcus

Browse source 
[staging-next] python3Packages.libarcus: fix build against protobuf 3.18+
This commit is contained in:
Luke Granger-Brown 2021-09-23 14:29:00 +01:00 committed by GitHub
parent 9aa6b019a7 d9eefb5d67
commit 2a102ddcd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/python-modules/libarcus/default.nix
View file

@ -1,4 +1,5 @@
{ lib, buildPythonPackage, python, fetchFromGitHub
, fetchpatch
, cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage rec {
@ -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 ];