From 1262a9bcf735d0955cd6a9db8b95aa242f3571e6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 14 Feb 2026 12:56:27 +0100 Subject: [PATCH] vips: fix cross compilation on riscv --- pkgs/by-name/vi/vips/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index e7270aa523f2..369d923d8d10 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -46,6 +46,10 @@ withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages, + withDevDoc ? + !stdenv.hostPlatform.isDarwin + && !stdenv.hostPlatform.isFreeBSD + && !(stdenv.hostPlatform.isRiscV && stdenv.isLinux), # passthru testers, @@ -62,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { "man" "dev" ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ "devdoc" ]; + ++ lib.optionals withDevDoc [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; @@ -87,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ + ++ lib.optionals withDevDoc [ gi-docgen ]; @@ -135,9 +139,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "spng" false) # we want to use libpng (lib.mesonEnable "introspection" withIntrospection) ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) ( - lib.mesonBool "docs" true - ) + ++ lib.optional withDevDoc (lib.mesonBool "docs" true) ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false); postFixup = ''