From 6a523a180a4a9a2032ae06eb657848d65256d258 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras <ioannis.koutras@gmail.com> Date: Sat, 2 Mar 2019 15:13:45 +0200 Subject: [PATCH 1/2] pythonPackages.libarcus: use pkgs.protobuf as input This commit makes pkgs.protobuf the input for libarcus, since the latter searches for the native protobuf library and not for the Python module. --- pkgs/development/python-modules/libarcus/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 8d0bf2b7b17..004fedf79b4 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -15,8 +15,9 @@ buildPythonPackage rec { disabled = pythonOlder "3.4.0"; - propagatedBuildInputs = [ sip protobuf ]; + propagatedBuildInputs = [ sip ]; nativeBuildInputs = [ cmake ]; + buildInputs = [ protobuf ]; postPatch = '' # To workaround buggy SIP detection which overrides PYTHONPATH diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5acc12fe4ba..99b2dc5ac38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2996,7 +2996,7 @@ in { 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 { }; From c14eed2ac0e6e325d9c980990e46d93826325764 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras <ioannis.koutras@gmail.com> Date: Sat, 2 Mar 2019 17:04:09 +0200 Subject: [PATCH 2/2] curaengine: add protobuf in buildInputs --- pkgs/applications/misc/curaengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 22215a7e2c6..ac0f9d542dd 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb, protobuf }: stdenv.mkDerivation rec { name = "curaengine-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libarcus stb ]; + buildInputs = [ libarcus stb protobuf ]; cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];