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

ola: use python36 (#52097)

Browse Source 
python37.pkgs.protobuf does not build with protobuf3_1
This commit is contained in:
Robert Schütz 2018-12-15 12:31:45 +01:00 committed by GitHub
parent feb0aba969
commit d4255008af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/ola/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
, libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd , libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd
, perl, python3, python3Packages , perl, python36 # Replace by python3 after the next update
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ]; buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python36 ];
propagatedBuildInputs = [ propagatedBuildInputs = [
(python3Packages.protobuf.override { protobuf = protobuf3_1; }) (python36.pkgs.protobuf.override { protobuf = protobuf3_1; })
python3Packages.numpy python36.pkgs.numpy
]; ];
configureFlags = [ "--enable-python-libs" ]; configureFlags = [ "--enable-python-libs" ];