Skip to content

ola: use python36 #52097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotlambda merged 1 commit into from
Dec 15, 2018
Merged

ola: use python36 #52097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/applications/misc/ola/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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" ];
Expand Down