From bfdfcd493c95e86298b11b7ba32a4d054ba0b63c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 10 Jul 2026 16:32:27 -0500 Subject: [PATCH] vigra: move args out of top-level (cherry picked from commit d0fd6f83bbd6b5f23899dbfd3ab9226741d3965b) --- pkgs/development/libraries/vigra/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 14760defa896..0ecdf55075c5 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -32,11 +32,14 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; + buildInputs = [ boost fftw fftwSinglePrec - hdf5 + (hdf5.override { + apiVersion = "v110"; + }) libjpeg libpng libtiff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eb0e538a622..7d91d1df9a8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7145,9 +7145,7 @@ with pkgs; inherit (llvmPackages) openmp; }; - vigra = callPackage ../development/libraries/vigra { - hdf5 = hdf5.override { apiVersion = "v110"; }; - }; + vigra = callPackage ../development/libraries/vigra { }; vte-gtk4 = vte.override { gtkVersion = "4";