vips: do not run configure twice
This commit is contained in:
parent
9806a7638b
commit
1829f233dc
1 changed files with 11 additions and 1 deletions
|
@ -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; {
|
||||
|
|
Loading…
Reference in a new issue