Merge pull request #194050 from kilianar/indilib-1.9.8

indilib: 1.9.6 -> 1.9.8
This commit is contained in:
Jörg Thalheim 2022-10-02 17:40:05 +02:00 committed by GitHub
commit e748d4d029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

@ -6,6 +6,7 @@
, libusb1
, zlib
, boost
, libev
, libnova
, curl
, libjpeg
@ -15,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "indilib";
version = "1.9.6";
version = "1.9.8";
src = fetchFromGitHub {
owner = "indilib";
repo = "indi";
rev = "v${version}";
sha256 = "sha256-rElxc9q4i8FjjPmLXhu6GnHps6t3NWkfxtqAAeRq77M=";
sha256 = "sha256-+KFuZgM/Bl6Oezq3WXjWCHefc1wvR3wOKXejmT0pw1U=";
};
nativeBuildInputs = [
@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
cfitsio
libev
libusb1
zlib
boost

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
for f in libfishcamp/CMakeLists.txt libsbig/CMakeLists.txt
for f in {libfishcamp,libsbig,libqhy}/CMakeLists.txt
do
substituteInPlace $f --replace "/lib/firmware" "lib/firmware"
done

@ -1,12 +1,12 @@
{ stdenv, lib, callPackage, fetchFromGitHub, indilib }:
let
indi-version = "1.9.3";
indi-version = "1.9.8";
indi-3rdparty-src = fetchFromGitHub {
owner = "indilib";
repo = "indi-3rdparty";
rev = "v${indi-version}";
sha256 = "sha256-TBccdheBEO48uIXd6tya6dytkzxaHg2+YancBkcL3bw=";
sha256 = "sha256-ZFbMyjMvAWcdsl+1TyX5/v5nY1DqvhZ2ckFBDe8gdQg=";
};
indi-firmware = callPackage ./indi-firmware.nix {
version = indi-version;