Merge pull request #275199 from sheepforce/indi-update

indilib: 2.0.3 -> 2.0.5
This commit is contained in:
Weijia Wang 2023-12-19 04:59:11 +01:00 committed by GitHub
commit 9d60f8bd69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions

View file

@ -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 = [

View file

@ -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
];

View file

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
"-DCONF_DIR=etc"
"-DBUILD_LIBS=1"
"-DWITH_PENTAX=off"
"-DWITH_AHP_XC=off"
];
postPatch = ''

View file

@ -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;