pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #81664 from jtojnar/vips-cleanup

vips: general clean-ups

authored by Jan Tojnar and committed by GitHub 9d0fac46 b01052f1

+67 -21
unified split
+3 -6
pkgs/development/node-packages/default-v10.nix
··· 115 joplin = nodePackages.joplin.override { 116 nativeBuildInputs = [ pkgs.pkg-config ]; 117 buildInputs = with pkgs; [ 118 - # sharp, dep list: 119 - # http://sharp.pixelplumbing.com/en/stable/install/ 120 - cairo expat fontconfig freetype fribidi gettext giflib 121 - glib harfbuzz lcms libcroco libexif libffi libgsf 122 - libjpeg_turbo libpng librsvg libtiff vips 123 - libwebp libxml2 pango pixman zlib 124 125 nodePackages.node-pre-gyp 126 ];
··· 115 joplin = nodePackages.joplin.override { 116 nativeBuildInputs = [ pkgs.pkg-config ]; 117 buildInputs = with pkgs; [ 118 + # required by sharp 119 + # https://sharp.pixelplumbing.com/install 120 + vips 121 122 nodePackages.node-pre-gyp 123 ];
+1 -1
pkgs/development/ruby-modules/gem-config/default.nix
··· 506 --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" 507 508 substituteInPlace lib/vips.rb \ 509 - --replace "vips_libname = 'vips'" "vips_libname = '${vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" 510 ''; 511 }; 512
··· 506 --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" 507 508 substituteInPlace lib/vips.rb \ 509 + --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" 510 ''; 511 }; 512
+63 -14
pkgs/tools/graphics/vips/default.nix
··· 1 - { stdenv, pkgconfig, glib, libxml2, expat, 2 - fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, 3 - ApplicationServices, 4 - python27, libpng ? null, 5 - fetchFromGitHub, 6 - autoreconfHook, 7 - gtk-doc, 8 - gobject-introspection, 9 }: 10 11 stdenv.mkDerivation rec { 12 pname = "vips"; 13 version = "8.9.1"; 14 15 src = fetchFromGitHub { 16 owner = "libvips"; ··· 24 ''; 25 }; 26 27 - nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; 28 - buildInputs = [ glib libxml2 fftw orc lcms 29 - imagemagick openexr libtiff libjpeg 30 - libgsf libexif python27 libpng expat ] 31 - ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; 32 33 autoreconfPhase = '' 34 - ./autogen.sh 35 ''; 36 37 meta = with stdenv.lib; {
··· 1 + { stdenv 2 + , pkgconfig 3 + , glib 4 + , libxml2 5 + , expat 6 + , fftw 7 + , orc 8 + , lcms 9 + , imagemagick 10 + , openexr 11 + , libtiff 12 + , libjpeg 13 + , libgsf 14 + , libexif 15 + , ApplicationServices 16 + , python27 17 + , libpng ? null 18 + , fetchFromGitHub 19 + , fetchpatch 20 + , autoreconfHook 21 + , gtk-doc 22 + , gobject-introspection 23 + , 24 }: 25 26 stdenv.mkDerivation rec { 27 pname = "vips"; 28 version = "8.9.1"; 29 + 30 + outputs = [ "bin" "out" "man" "dev" ]; 31 32 src = fetchFromGitHub { 33 owner = "libvips"; ··· 41 ''; 42 }; 43 44 + patches = [ 45 + # autogen.sh should not run configure 46 + # https://github.com/libvips/libvips/pull/1566 47 + (fetchpatch { 48 + url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch"; 49 + sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp"; 50 + }) 51 + ]; 52 + 53 + nativeBuildInputs = [ 54 + pkgconfig 55 + autoreconfHook 56 + gtk-doc 57 + gobject-introspection 58 + ]; 59 + 60 + buildInputs = [ 61 + glib 62 + libxml2 63 + fftw 64 + orc 65 + lcms 66 + imagemagick 67 + openexr 68 + libtiff 69 + libjpeg 70 + libgsf 71 + libexif 72 + python27 73 + libpng 74 + expat 75 + ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; 76 + 77 + # Required by .pc file 78 + propagatedBuildInputs = [ 79 + glib 80 + ]; 81 82 autoreconfPhase = '' 83 + NOCONFIGURE=1 ./autogen.sh 84 ''; 85 86 meta = with stdenv.lib; {