indilib: fix build

It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

While at it, also move cmake to nativeBuildInputs and format the expression.
This commit is contained in:
Jan Tojnar 2020-04-04 10:43:23 +02:00
parent e37c162cd9
commit eb8e95294e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,5 +1,15 @@
{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova { stdenv
, curl, libjpeg, gsl }: , fetchurl
, cmake
, cfitsio
, libusb1
, zlib
, boost
, libnova
, curl
, libjpeg
, gsl
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "indilib-1.1.0"; name = "indilib-1.1.0";
@ -9,13 +19,27 @@ stdenv.mkDerivation {
sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w";
}; };
patches = [ ./udev-dir.patch ] ; patches = [
./udev-dir.patch
];
buildInputs = [ curl cmake cfitsio libusb zlib boost nativeBuildInputs = [
libnova libjpeg gsl ]; cmake
];
buildInputs = [
curl
cfitsio
libusb1
zlib
boost
libnova
libjpeg
gsl
];
meta = { meta = {
homepage = https://www.indilib.org/; homepage = "https://www.indilib.org/";
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
description = "Implementaion of the INDI protocol for POSIX operating systems"; description = "Implementaion of the INDI protocol for POSIX operating systems";
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;