From fa34cd580f45d13ed85e6fbe30ce36b59f3c4a8b Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Mon, 6 Apr 2026 11:47:56 +0200 Subject: [PATCH] indi-3rdparty: 2.1.9 -> 2.2.0 --- .../astronomy/indilib/indi-3rdparty.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index c6b575f86d81..6416a1428ff1 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -41,13 +41,13 @@ }: let - thirdparty_version = "2.1.9"; + thirdparty_version = "2.2.0"; fxload = libusb1.override { withExamples = true; }; src-3rdparty = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; rev = "v${thirdparty_version}"; - hash = "sha256-zHcJDbi+xsI1xDnZTFmUbk4GNGD8WqZUzf3hfSCmvpU="; + hash = "sha256-JGDaRlKYgHADMC3C2kiRmTqoL0dHuJKXiUVAYknQsGA="; }; buildIndi3rdParty = @@ -241,7 +241,7 @@ let pname = "libfishcamp"; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/firmware" "lib/firmware" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/firmware" "lib/firmware" ''; buildInputs = [ @@ -426,7 +426,7 @@ let postPatch = '' sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt substituteInPlace CMakeLists.txt \ - --replace-fail "/lib/firmware" "lib/firmware" + --replace-fail "/usr/lib/firmware" "lib/firmware" substituteInPlace 85-qhyccd.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ @@ -487,7 +487,7 @@ let postPatch = '' sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt - substituteInPlace CMakeLists.txt --replace-fail "/lib/firmware" "lib/firmware" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/firmware" "lib/firmware" substituteInPlace 51-sbig-debian.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ --replace-fail "/lib/firmware" "$out/lib/firmware" @@ -635,7 +635,7 @@ in libnova ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; }; @@ -745,8 +745,8 @@ in postPatch = '' substituteInPlace CMakeLists.txt \ - --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" \ - --replace-fail "/lib/firmware" "lib/firmware" + --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" \ + --replace-fail "/usr/lib/firmware" "lib/firmware" substituteInPlace 99-meadedsi.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ --replace-fail "/lib/firmware" "$out/lib/firmware" @@ -979,7 +979,7 @@ in ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; }; @@ -1036,7 +1036,7 @@ in ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; meta.platforms = libqsi.meta.platforms; @@ -1109,6 +1109,7 @@ in buildInputs = [ cfitsio indilib + libusb1 zlib ]; propagatedBuildInputs = [ libsvbony ]; @@ -1124,7 +1125,7 @@ in libusb1 ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/usr/lib/udev/rules.d" "lib/udev/rules.d" ''; };