From dcbcc85fea81015c87417c0d18195925c3a76556 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 12 Jan 2015 03:00:54 +0100 Subject: [PATCH] miro: Fix build by adding sqlite to buildInputs. 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 --- pkgs/applications/video/miro/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index cd203391749..6585306b289 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, buildPythonPackage, pythonPackages, pkgconfig , 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 , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg , enableBonjour ? false, avahi ? null @@ -70,7 +70,7 @@ buildPythonPackage rec { buildInputs = [ pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup - pygtk taglib gsettings_desktop_schemas + pygtk taglib gsettings_desktop_schemas sqlite ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 234d369e08b..b9e75e0421c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6525,7 +6525,7 @@ let minmay = callPackage ../development/libraries/minmay { }; miro = callPackage ../applications/video/miro { - inherit (pythonPackages) pywebkitgtk pysqlite pycurl mutagen; + inherit (pythonPackages) pywebkitgtk pycurl mutagen; avahi = avahi.override { withLibdnssdCompat = true; };