public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protobuf: Mark as disabled on py3k and fix python executable references

Browse Source
This commit is contained in:
William A. Kennington III 2015-02-20 11:17:08 -08:00
parent a959cc91cf
commit 29fc0daa27
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/python-packages.nix
View File

@ -7527,6 +7527,7 @@ let
protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
protobufBuild = protobuf: buildPythonPackage rec { protobufBuild = protobuf: buildPythonPackage rec {
inherit (protobuf) name src; inherit (protobuf) name src;
disabled = isPy3k;
propagatedBuildInputs = with self; [ protobuf google_apputils ]; propagatedBuildInputs = with self; [ protobuf google_apputils ];
@ -7543,9 +7544,9 @@ let
''; '';
checkPhase = if versionAtLeast protobuf.version "2.6.0" then '' 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 '' '' else ''
python setup.py test ${python.executable} setup.py test
''; '';
installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation"; installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation";