From d4255008afc5fbe163600e68218eb14eee75b258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 15 Dec 2018 12:31:45 +0100 Subject: [PATCH] ola: use python36 (#52097) python37.pkgs.protobuf does not build with protobuf3_1 --- pkgs/applications/misc/ola/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index fce6b8426cb..e16d9354bb4 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig , libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd -, perl, python3, python3Packages +, perl, python36 # Replace by python3 after the next update }: stdenv.mkDerivation rec { @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { }; 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 = [ - (python3Packages.protobuf.override { protobuf = protobuf3_1; }) - python3Packages.numpy + (python36.pkgs.protobuf.override { protobuf = protobuf3_1; }) + python36.pkgs.numpy ]; configureFlags = [ "--enable-python-libs" ];