nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

webkitgtk-2.4: drop autoreconf, propagate harfbuzz-icu

Browse Source 
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:
Vladimír Čunát 2015-09-29 18:11:03 +02:00
parent 8d7fba9b65
commit bfd8e56aa6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/webkitgtk/2.4.nix
View File

@ -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
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
, libxml2, libsoup, libsecret, libxslt, harfbuzz
@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
prePatch = ''
patchShebangs Tools/gtk
'';
# patch *.in between autoreconf and configure
postAutoreconf = "patch -p1 < ${./webcore-svg-libxml-cflags.patch}";
patches = [ ./webcore-svg-libxml-cflags.patch ];
configureFlags = with stdenv.lib; [
"--disable-geolocation"
@ -44,18 +42,18 @@ stdenv.mkDerivation rec {
dontAddDisableDepTrack = true;
nativeBuildInputs = [
autoreconfHook perl python ruby bison gperf flex
perl python ruby bison gperf flex
pkgconfig which gettext gobjectIntrospection
];
buildInputs = [
gtk2 wayland libwebp enchant
libxml2 libsecret libxslt harfbuzz
libxml2 libsecret libxslt
gst-plugins-base sqlite
];
propagatedBuildInputs = [
libsoup
libsoup harfbuzz/*icu in *.la*/
(if withGtk2 then gtk2 else gtk3)
];