webkitgtk-2.4: drop autoreconf, propagate harfbuzz-icu
The autoreconf phase isn't needed anymore but wasn't removed. Fixes #10099 (I think). It's maybe slightly wasteful for the closure, but it's likely that in the case of webkit it won't be a big deal and icu might be in the closure anyway.
This commit is contained in:
parent
8d7fba9b65
commit
bfd8e56aa6
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, autoreconfHook, perl, python, ruby, bison, gperf, flex
|
{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
|
||||||
, pkgconfig, which, gettext, gobjectIntrospection
|
, pkgconfig, which, gettext, gobjectIntrospection
|
||||||
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
|
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
|
||||||
, libxml2, libsoup, libsecret, libxslt, harfbuzz
|
, libxml2, libsoup, libsecret, libxslt, harfbuzz
|
||||||
@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
|
|||||||
prePatch = ''
|
prePatch = ''
|
||||||
patchShebangs Tools/gtk
|
patchShebangs Tools/gtk
|
||||||
'';
|
'';
|
||||||
|
patches = [ ./webcore-svg-libxml-cflags.patch ];
|
||||||
# patch *.in between autoreconf and configure
|
|
||||||
postAutoreconf = "patch -p1 < ${./webcore-svg-libxml-cflags.patch}";
|
|
||||||
|
|
||||||
configureFlags = with stdenv.lib; [
|
configureFlags = with stdenv.lib; [
|
||||||
"--disable-geolocation"
|
"--disable-geolocation"
|
||||||
@ -44,18 +42,18 @@ stdenv.mkDerivation rec {
|
|||||||
dontAddDisableDepTrack = true;
|
dontAddDisableDepTrack = true;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook perl python ruby bison gperf flex
|
perl python ruby bison gperf flex
|
||||||
pkgconfig which gettext gobjectIntrospection
|
pkgconfig which gettext gobjectIntrospection
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk2 wayland libwebp enchant
|
gtk2 wayland libwebp enchant
|
||||||
libxml2 libsecret libxslt harfbuzz
|
libxml2 libsecret libxslt
|
||||||
gst-plugins-base sqlite
|
gst-plugins-base sqlite
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
libsoup
|
libsoup harfbuzz/*icu in *.la*/
|
||||||
(if withGtk2 then gtk2 else gtk3)
|
(if withGtk2 then gtk2 else gtk3)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user