public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass sqlite to webkitgtk --- fails to configure otherwise

Browse Source
This commit is contained in:
Michael Raskin 2015-01-06 19:34:24 +03:00
parent 053083368b
commit 6d74aacbea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/webkitgtk/2.4.6.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, 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 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
, libxml2, libsoup, libsecret, libxslt, harfbuzz , libxml2, libsoup, libsecret, libxslt, harfbuzz
, gst-plugins-base , gst-plugins-base
, withGtk2 ? false , withGtk2 ? false
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk2 wayland libwebp enchant gtk2 wayland libwebp enchant
libxml2 libsecret libxslt harfbuzz libxml2 libsecret libxslt harfbuzz
gst-plugins-base gst-plugins-base sqlite
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, gettext, gobjectIntrospection , pkgconfig, gettext, gobjectIntrospection
, gtk2, gtk3, wayland, libwebp, enchant , gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
, enableGeoLocation ? true, geoclue2 , enableGeoLocation ? true, geoclue2, sqlite
, gst-plugins-base , gst-plugins-base
}: }:
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPORT=GTK" ]; cmakeFlags = [ "-DPORT=GTK" ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake perl python ruby bison gperf cmake perl python ruby bison gperf sqlite
pkgconfig gettext gobjectIntrospection pkgconfig gettext gobjectIntrospection
]; ];