diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-04 01:27:23 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-04 01:27:23 +0100 |
| commit | 1829f233dc4d1afda19d4f3866baa7c86993a2ce (patch) | |
| tree | 565b82c2610a931d4537c30f0934c6b03b9f3c20 /pkgs/tools/graphics/vips | |
| parent | 9806a7638b7f26fafe48496c5d544aa52aa4bc4a (diff) | |
vips: do not run configure twice
Diffstat (limited to 'pkgs/tools/graphics/vips')
| -rw-r--r-- | pkgs/tools/graphics/vips/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 3b09f0172cdb..190cc6f0d297 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -16,6 +16,7 @@ , python27 , libpng ? null , fetchFromGitHub +, fetchpatch , autoreconfHook , gtk-doc , gobject-introspection @@ -38,6 +39,15 @@ stdenv.mkDerivation rec { ''; }; + patches = [ + # autogen.sh should not run configure + # https://github.com/libvips/libvips/pull/1566 + (fetchpatch { + url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch"; + sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp"; + }) + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook @@ -63,7 +73,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; autoreconfPhase = '' - ./autogen.sh + NOCONFIGURE=1 ./autogen.sh ''; meta = with stdenv.lib; { |