ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #215074 from dotlambda/vips-8.14.1

Browse Source
This commit is contained in:
Sandro 2023-02-15 01:09:07 +01:00 committed by GitHub
commit c9fbcf0416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/imaginary/default.nix
View File

@ -39,6 +39,8 @@ buildGoModule rec {
"-X main.Version=${version}"
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
homepage = "https://fly.io/docs/app-guides/run-a-global-image-service";
changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}";

30
pkgs/tools/graphics/vips/default.nix
View File

@ -8,9 +8,10 @@
, Foundation
, python3
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, meson
, ninja
, gtk-doc
, docbook-xsl-nons
, gobject-introspection
# Optional dependencies
, libjpeg
@ -38,15 +39,15 @@
stdenv.mkDerivation rec {
pname = "vips";
version = "8.13.3";
version = "8.14.1";
outputs = [ "bin" "out" "man" "dev" ];
outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ];
src = fetchFromGitHub {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo=";
hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
@ -56,9 +57,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
autoreconfHook
gtk-doc
meson
ninja
docbook-xsl-nons
gobject-introspection
] ++ lib.optionals (!stdenv.isDarwin) [
gtk-doc
];
buildInputs = [
@ -95,11 +99,17 @@ stdenv.mkDerivation rec {
glib
];
autoreconfPhase = ''
NOCONFIGURE=1 ./autogen.sh
'';
mesonFlags = [
"-Dcgif=disabled"
"-Dspng=disabled"
"-Dpdfium=disabled"
"-Dnifti=disabled"
] ++ lib.optionals (!stdenv.isDarwin) [
"-Dgtk_doc=true"
];
meta = with lib; {
changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog";
homepage = "https://libvips.github.io/libvips/";
description = "Image processing system for large images";
license = licenses.lgpl2Plus;