diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-19 04:59:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-19 04:59:11 +0100 |
commit | 9d60f8bd69182ceb928f2a4131c1abdefc423aaf (patch) | |
tree | 62a5eed1bb0e5617f9d9902a9e0b5326806364d8 /pkgs/development/libraries | |
parent | e25424390351cf15a51475218b12f663e15ecef1 (diff) | |
parent | 8a61def159502f5d5d0e351bbd43fc20010122ae (diff) |
Merge pull request #275199 from sheepforce/indi-update
indilib: 2.0.3 -> 2.0.5
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 0b4526e6e1eb..3fae85187deb 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - hash = "sha256-YhUwRbpmEybezvopbqFj7M1EE3pufkNrN8yi/zbnJ3U="; + hash = "sha256-n1zj1U26l30JYr5Tio5zwv8v/e2cjEeIRGsyncMtt9I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index fdbdb4db24bf..9dafb64e9292 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -20,6 +20,8 @@ , gpsd , ffmpeg , limesuite +, pkg-config +, zeromq , version , src , withFirmware ? false @@ -35,12 +37,12 @@ stdenv.mkDerivation rec { inherit version src; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw - limesuite + limesuite zeromq ] ++ lib.optionals withFirmware [ firmware ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 102a8b901cce..1eedfd3fea0b 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { "-DCONF_DIR=etc" "-DBUILD_LIBS=1" "-DWITH_PENTAX=off" + "-DWITH_AHP_XC=off" ]; postPatch = '' diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 6b110a152ee3..e2018ce7c2b0 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -6,7 +6,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${version}"; - hash = "sha256-xAGSFTOfO9P8JldzY59OnQULzf2Mlx3vWjoP+IDdEFE="; + hash = "sha256-EtwN3yuMsT9CV+CapkKDy3e92u9Blvy+ySrQU586Z1s="; }; indi-firmware = callPackage ./indi-firmware.nix { inherit version; |