Unverified Commit ce9bb764 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

vips: fix cross compilation on riscv (#490363)

parents ae803d0a 1262a9bc

pkgs/by-name/vi/vips/package.nix

+7 −5
Original line number Diff line number Diff line
@@ -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 = ''