ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

miro: Fix build by adding sqlite to buildInputs.

Browse Source 
The dependency on sqlite was propagated through to miro by libsoup, but
with f570f97, it's no longer propagated anymore so we need to pass it to
the miro derivation directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-01-12 03:00:54 +01:00
parent 947a4c582e
commit dcbcc85fea
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/miro/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages, pkgconfig { stdenv, fetchurl, python, buildPythonPackage, pythonPackages, pkgconfig
, pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk , pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk
, taglib, pysqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk , taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk
, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
, gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
, enableBonjour ? false, avahi ? null , enableBonjour ? false, avahi ? null
@ -70,7 +70,7 @@ buildPythonPackage rec {
buildInputs = [ buildInputs = [
pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup
pygtk taglib gsettings_desktop_schemas pygtk taglib gsettings_desktop_schemas sqlite
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -6525,7 +6525,7 @@ let
minmay = callPackage ../development/libraries/minmay { }; minmay = callPackage ../development/libraries/minmay { };
miro = callPackage ../applications/video/miro { miro = callPackage ../applications/video/miro {
inherit (pythonPackages) pywebkitgtk pysqlite pycurl mutagen; inherit (pythonPackages) pywebkitgtk pycurl mutagen;
avahi = avahi.override { avahi = avahi.override {
withLibdnssdCompat = true; withLibdnssdCompat = true;
}; };