summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-04-04 10:43:23 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-04-04 10:43:23 +0200
commiteb8e95294ebdd066e502725b2bcc3359444a79c1 (patch)
tree243e5e780f7529386a81576a2103645634a32be9
parente37c162cd94e55b05ec9700387098924b0745315 (diff)
downloadnixpkgs-eb8e95294ebdd066e502725b2bcc3359444a79c1.tar
nixpkgs-eb8e95294ebdd066e502725b2bcc3359444a79c1.tar.gz
nixpkgs-eb8e95294ebdd066e502725b2bcc3359444a79c1.tar.bz2
nixpkgs-eb8e95294ebdd066e502725b2bcc3359444a79c1.tar.lz
nixpkgs-eb8e95294ebdd066e502725b2bcc3359444a79c1.tar.xz
nixpkgs-eb8e95294ebdd066e502725b2bcc3359444a79c1.tar.zst
nixpkgs-eb8e95294ebdd066e502725b2bcc3359444a79c1.zip
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.
-rw-r--r--pkgs/development/libraries/indilib/default.nix36
1 files changed, 30 insertions, 6 deletions
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 5816f044f57..6fe4484e6a3 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova
-, curl, libjpeg, gsl }:
+{ stdenv
+, fetchurl
+, cmake
+, cfitsio
+, libusb1
+, zlib
+, boost
+, libnova
+, curl
+, libjpeg
+, gsl
+}:
 
 stdenv.mkDerivation {
   name = "indilib-1.1.0";
@@ -9,13 +19,27 @@ stdenv.mkDerivation {
     sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w";
   };
 
-  patches = [ ./udev-dir.patch ] ;
+  patches = [
+    ./udev-dir.patch
+  ];
 
-  buildInputs = [ curl cmake cfitsio libusb zlib boost
-                            libnova libjpeg gsl ];
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    curl
+    cfitsio
+    libusb1
+    zlib
+    boost
+    libnova
+    libjpeg
+    gsl
+  ];
 
   meta = {
-    homepage = https://www.indilib.org/;
+    homepage = "https://www.indilib.org/";
     license = stdenv.lib.licenses.lgpl2Plus;
     description = "Implementaion of the INDI protocol for POSIX operating systems";
     platforms = stdenv.lib.platforms.unix;