diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2019-04-14 14:44:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-14 14:44:55 +0200 |
| commit | 90d166dc7d715ca4c14aa2292e37e9bb00a714cb (patch) | |
| tree | 12603d71c3893564b9f9c8031aba20b38aca24b1 /pkgs/development/python-modules | |
| parent | 96b2ddf0df581c8665da12b686fa26eced3d3106 (diff) | |
| parent | 905cdeecacec1471550022b534ea977ab82d25a9 (diff) | |
Merge pull request #57181 from FlorianFranzen/protobuf
protobuf: 3.6 -> 3.7
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/protobuf/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 4f00537db0c8..69dce2723ebb 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; - patches = optional isPy37 - # Python 3.7 compatibility (remove when protobuf 3.7 is released) + patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) + # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; @@ -41,9 +41,9 @@ buildPythonPackage rec { preBuild = '' # Workaround for https://github.com/google/protobuf/issues/2895 - ${python}/bin/${python.executable} setup.py build + ${python.interpreter} setup.py build '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' - ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation + ${python.interpreter} setup.py build_ext --cpp_implementation ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") |