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

Merge pull request #56696 from jokogr/f/libarcus 

pythonPackages.libarcus: use pkgs.protobuf as input
This commit is contained in:
Robert Schütz 2019-03-05 09:10:29 +01:00 committed by GitHub
parent 01f88218d2 c14eed2ac0
commit 9b3e5a3aab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/curaengine/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb }: { stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb, protobuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curaengine-${version}"; name = "curaengine-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libarcus stb ]; buildInputs = [ libarcus stb protobuf ];
cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];

3
pkgs/development/python-modules/libarcus/default.nix
View File

@ -15,8 +15,9 @@ buildPythonPackage rec {
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";
propagatedBuildInputs = [ sip protobuf ]; propagatedBuildInputs = [ sip ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];
postPatch = '' postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH # To workaround buggy SIP detection which overrides PYTHONPATH

2
pkgs/top-level/python-packages.nix
View File

@ -2996,7 +2996,7 @@ in {
fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
libarcus = callPackage ../development/python-modules/libarcus { }; libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };
libcloud = callPackage ../development/python-modules/libcloud { }; libcloud = callPackage ../development/python-modules/libcloud { };