diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 7f66549893bd..ab95eeb51f91 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchpatch, python, buildPythonPackage, isPy37 +{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37 , protobuf, google_apputils, pyext, libcxx, isPy27 , disabled, doCheck ? true }: with stdenv.lib; buildPythonPackage { - inherit (protobuf) name src version; + inherit (protobuf) pname src version; inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 @@ -15,8 +15,10 @@ buildPythonPackage { ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98" ); + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ google_apputils ]; - propagatedNativeBuildInputs = [ protobuf ]; # For protoc. + propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; @@ -43,9 +45,9 @@ buildPythonPackage { preBuild = '' # Workaround for https://github.com/google/protobuf/issues/2895 - ${python.interpreter} setup.py build + ${python.pythonForBuild.interpreter} setup.py build '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' - ${python.interpreter} setup.py build_ext --cpp_implementation + ${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") |