From 63b07e8d665b04ac22487761c01588f8ef31bda0 Mon Sep 17 00:00:00 2001 From: sheepforce Date: Tue, 18 Jul 2023 14:46:13 +0200 Subject: [PATCH] indi-full: 1.9.8 -> 2.0.2, reenable Atik, Pentax and SX drivers --- .../astronomy/indilib/indi-3rdparty.nix | 18 ++++++++---------- .../astronomy/indilib/indi-firmware.nix | 5 +++-- .../science/astronomy/indilib/indi-full.nix | 19 +++++++++---------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 7144a17c18b4..2423a6e20e34 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -17,6 +17,7 @@ , libdc1394 , gpsd , ffmpeg +, limesuite , version , src , withFirmware ? false @@ -33,22 +34,22 @@ stdenv.mkDerivation rec { buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw + limesuite ] ++ lib.optionals withFirmware [ firmware ]; postPatch = '' - for f in indi-qsi/CMakeLists.txt \ - indi-dsi/CMakeLists.txt \ - indi-armadillo-platypus/CMakeLists.txt \ - indi-orion-ssg3/CMakeLists.txt - do + for f in $(find . -name "CMakeLists.txt"); do substituteInPlace $f \ --replace "/lib/udev/rules.d" "lib/udev/rules.d" \ --replace "/etc/udev/rules.d" "lib/udev/rules.d" \ --replace "/lib/firmware" "lib/firmware" done + substituteInPlace libpktriggercord/CMakeLists.txt \ + --replace "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)" + sed '1i#include ' -i indi-duino/libfirmata/src/firmata.cpp # gcc12 ''; @@ -57,11 +58,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d" - # Pentax, Atik, and SX cmakelists are currently broken - "-DWITH_PENTAX=off" - "-DWITH_ATIK=off" - "-DWITH_SX=off" ] ++ lib.optionals (!withFirmware) [ + "-DWITH_ATIK=off" "-DWITH_APOGEE=off" "-DWITH_DSI=off" "-DWITH_QHY=off" @@ -75,7 +73,7 @@ stdenv.mkDerivation rec { description = "Third party drivers for the INDI astronomical software suite"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 660433c2dd59..7875051cbf79 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -19,6 +19,7 @@ , ffmpeg , version , src +, autoPatchelfHook }: stdenv.mkDerivation rec { @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { inherit version src; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake autoPatchelfHook ]; buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { description = "Third party firmware for the INDI astronomical software suite"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index fae8b95cb28c..6b110a152ee3 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,30 +1,29 @@ { stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-version = "1.9.8"; + inherit (indilib) version; indi-3rdparty-src = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; - rev = "v${indi-version}"; - sha256 = "sha256-ZFbMyjMvAWcdsl+1TyX5/v5nY1DqvhZ2ckFBDe8gdQg="; + rev = "v${version}"; + hash = "sha256-xAGSFTOfO9P8JldzY59OnQULzf2Mlx3vWjoP+IDdEFE="; }; indi-firmware = callPackage ./indi-firmware.nix { - version = indi-version; + inherit version; src = indi-3rdparty-src; }; indi-3rdparty = callPackage ./indi-3rdparty.nix { - version = indi-version; + inherit version; src = indi-3rdparty-src; - withFirmware = stdenv.isx86_64; + withFirmware = stdenv.isx86_64 || stdenv.isAarch64; firmware = indi-firmware; }; in callPackage ./indi-with-drivers.nix { pname = "indi-full"; - version = indi-version; + inherit version; extraDrivers = [ indi-3rdparty - ] ++ lib.optionals stdenv.isx86_64 [ - indi-firmware - ]; + ] ++ lib.optional (stdenv.isx86_64 || stdenv.isAarch64) indi-firmware + ; }