diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2018-12-15 12:31:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-15 12:31:45 +0100 |
| commit | d4255008afc5fbe163600e68218eb14eee75b258 (patch) | |
| tree | 322a8e7e200fea4889588206001317090ec6fad6 /pkgs/applications | |
| parent | feb0aba9690bc11b5160a638d4590fec1753048c (diff) | |
| download | nixpkgs-d4255008afc5fbe163600e68218eb14eee75b258.tar nixpkgs-d4255008afc5fbe163600e68218eb14eee75b258.tar.gz nixpkgs-d4255008afc5fbe163600e68218eb14eee75b258.tar.bz2 nixpkgs-d4255008afc5fbe163600e68218eb14eee75b258.tar.lz nixpkgs-d4255008afc5fbe163600e68218eb14eee75b258.tar.xz nixpkgs-d4255008afc5fbe163600e68218eb14eee75b258.tar.zst nixpkgs-d4255008afc5fbe163600e68218eb14eee75b258.zip | |
ola: use python36 (#52097)
python37.pkgs.protobuf does not build with protobuf3_1
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/ola/default.nix | 8 |
1 files 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" ]; |