From 7aad6a6a5ceb6af33b94dfcac6172e94ece8e915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 12:25:54 +0100 Subject: [PATCH] pythonPackages.protobuf: Disable google_apputils on python 3 --- .../python-modules/protobuf/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index ab95eeb51f9..595bab6cfa3 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,6 +1,18 @@ -{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37 -, protobuf, google_apputils, pyext, libcxx, isPy27 -, disabled, doCheck ? true }: +{ buildPackages +, stdenv +, fetchpatch +, python +, buildPythonPackage +, isPy37 +, protobuf +, google_apputils +, six +, pyext +, libcxx +, isPy27 +, disabled +, doCheck ? true +}: with stdenv.lib; @@ -17,9 +29,9 @@ buildPythonPackage { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ google_apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ google_apputils pyext ]; + propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google_apputils ]; + propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. + nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google_apputils ]; buildInputs = [ protobuf ]; patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2"))