diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 71fdca158aa0a..58fd0b0a1607a 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -5,8 +5,8 @@ # Native build inputs docbook-xsl-nons, + gi-docgen, gobject-introspection, - gtk-doc, meson, ninja, pkg-config, @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.16.1"; + version = "8.17.1"; outputs = [ "bin" @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; tag = "v${finalAttrs.version}"; - hash = "sha256-F2ymfvqwuCtNtFIOLgXvqRWATSMaeV7EQKYyQalCNfc="; + hash = "sha256-Sc2BWdQIgL/dI0zfbEQVCs3+1QBrLE7BsE3uFHe9C/c="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -74,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: { ''; }; + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ docbook-xsl-nons gobject-introspection @@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ - gtk-doc + gi-docgen ]; buildInputs = [ @@ -128,10 +132,14 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "introspection" withIntrospection) ] ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) ( - lib.mesonBool "gtk_doc" true + lib.mesonBool "docs" true ) ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false); + postFixup = '' + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { tests = { pkg-config = testers.hasPkgConfigModules { @@ -145,17 +153,17 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v([0-9.]+)" + "^v([0-9.]+)$" ]; }; }; - meta = with lib; { + meta = { changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; homepage = "https://www.libvips.org/"; description = "Image processing system for large images"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ kovirobi anthonyroussel ]; @@ -163,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { "vips" "vips-cpp" ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "vips"; }; })