diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-12-22 20:23:29 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-12-22 20:24:06 +0100 |
| commit | 7b244a1b316f72256a34660370f690524ef479a5 (patch) | |
| tree | 2bc7641d6dc0909092c818ffe0dff29f0a54ca5e | |
| parent | Merge pull request #206979 from doronbehar/pkg/gnuradio (diff) | |
| download | nixpkgs-origin/vips-meson.tar.gz | |
vips: Switch to Mesonorigin/vips-meson
Meson is the preferred build system since 8.13.
| -rw-r--r-- | pkgs/tools/graphics/vips/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 14831c70b047..35d00a97a84a 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -9,8 +9,10 @@ , python3 , fetchFromGitHub , fetchpatch -, autoreconfHook +, meson +, ninja , gtk-doc +, docbook-xsl-nons , gobject-introspection # Optional dependencies , libjpeg @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { pname = "vips"; version = "8.13.3"; - outputs = [ "bin" "out" "man" "dev" ]; + outputs = [ "bin" "out" "man" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; @@ -56,8 +58,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - autoreconfHook + meson + ninja gtk-doc + docbook-xsl-nons gobject-introspection ]; @@ -95,9 +99,13 @@ stdenv.mkDerivation rec { glib ]; - autoreconfPhase = '' - NOCONFIGURE=1 ./autogen.sh - ''; + mesonFlags = [ + "-Dgtk_doc=true" + "-Dcgif=disabled" + "-Dspng=disabled" + "-Dpdfium=disabled" + "-Dnifti=disabled" + ]; meta = with lib; { homepage = "https://libvips.github.io/libvips/"; |