ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-08 14:40:07 +03:00
Code Issues Projects Releases Wiki Activity

vips: do not run configure twice

Browse Source
This commit is contained in:
Jan Tojnar 2020-03-04 01:27:23 +01:00
parent 9806a7638b
commit 1829f233dc
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
, python27 , python27
, libpng ? null , libpng ? null
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, autoreconfHook , autoreconfHook
, gtk-doc , gtk-doc
, gobject-introspection , 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 = [ nativeBuildInputs = [
pkgconfig pkgconfig
autoreconfHook autoreconfHook
@ -63,7 +73,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
autoreconfPhase = '' autoreconfPhase = ''
./autogen.sh NOCONFIGURE=1 ./autogen.sh
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {