diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 0bd95a563934..0c82b12f83b5 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-Y2JmlboNU7e2Whvv6snd8Qgotr+AAkUkAd9qCORZoI0="; + hash = "sha256-ceDuWnIeHTpXyQRXDEQxCDM1pdfz5rEDMyJIcCu6OaM="; }; nativeBuildInputs = [ @@ -70,8 +70,8 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in $out/lib/udev/rules.d/*.rules do - substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ - --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + substituteInPlace $f --replace-quiet "/bin/sh" "${bash}/bin/sh" \ + --replace-quiet "/sbin/modprobe" "${kmod}/sbin/modprobe" done ''; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index d924ae431d78..0be919c6f202 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -9,6 +9,7 @@ coreutils, cfitsio, fetchFromGitHub, + fetchpatch, gtest, libusb1, libusb-compat-0_1, @@ -46,7 +47,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indilib.version}"; - hash = "sha256-REmeIP0Cl5FfwUnL40u0dqZaJugBlLGT/Bts5j1bvgw="; + hash = "sha256-zd88QHYhqxAQlzozXZMKXCFWKYqvGsPHhNxmkdexOOE="; }; buildIndi3rdParty = @@ -971,6 +972,14 @@ in indi-shelyak = buildIndi3rdParty { pname = "indi-shelyak"; buildInputs = [ indilib ]; + + patches = [ + (fetchpatch { + url = "https://github.com/indilib/indi-3rdparty/commit/db8106a9a03e0cfb700e02841d46f8b97b5513e0.patch"; + hash = "sha256-JJatmu/dxFEni6CdR6QUn7+EiPe18EwE7OmrCT8Nk2c="; + stripLen = 1; + }) + ]; }; indi-starbook = buildIndi3rdParty {