Merge pull request #275199 from sheepforce/indi-update
indilib: 2.0.3 -> 2.0.5
This commit is contained in:
commit
9d60f8bd69
4 changed files with 8 additions and 5 deletions
|
@ -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 = [
|
||||
|
|
|
@ -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
|
||||
];
|
||||
|
|
|
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
|||
"-DCONF_DIR=etc"
|
||||
"-DBUILD_LIBS=1"
|
||||
"-DWITH_PENTAX=off"
|
||||
"-DWITH_AHP_XC=off"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue