diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-02-20 11:17:08 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-02-20 11:17:08 -0800 |
| commit | 29fc0daa27c927ae5692be574a36c87d56946a2c (patch) | |
| tree | 84001ff17073ec1c8539d226c8207a36e04e3b08 /pkgs | |
| parent | a959cc91cf69a99103106ee4c0d0077c5d2226f7 (diff) | |
| download | nixpkgs-29fc0daa27c927ae5692be574a36c87d56946a2c.tar nixpkgs-29fc0daa27c927ae5692be574a36c87d56946a2c.tar.gz nixpkgs-29fc0daa27c927ae5692be574a36c87d56946a2c.tar.bz2 nixpkgs-29fc0daa27c927ae5692be574a36c87d56946a2c.tar.lz nixpkgs-29fc0daa27c927ae5692be574a36c87d56946a2c.tar.xz nixpkgs-29fc0daa27c927ae5692be574a36c87d56946a2c.tar.zst nixpkgs-29fc0daa27c927ae5692be574a36c87d56946a2c.zip | |
protobuf: Mark as disabled on py3k and fix python executable references
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b95e1fe15c..591cfec9d89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7527,6 +7527,7 @@ let protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; protobufBuild = protobuf: buildPythonPackage rec { inherit (protobuf) name src; + disabled = isPy3k; propagatedBuildInputs = with self; [ protobuf google_apputils ]; @@ -7543,9 +7544,9 @@ let ''; checkPhase = if versionAtLeast protobuf.version "2.6.0" then '' - python setup.py google_test --cpp_implementation + ${python.executable} setup.py google_test --cpp_implementation '' else '' - python setup.py test + ${python.executable} setup.py test ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation"; |