From 37eba0781063b77bf3b57345923943772c21825c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Oct 2016 09:07:34 +0200 Subject: [PATCH] firefox: drop pysqlite dependency since our interpreter ships with sqlite --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 1f3b3977e8f..828c3c9d2dd 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio , autoconf213, which @@ -34,7 +34,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa - xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx /* cairo */ icu libpng jemalloc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d6d8ec3700..a977fcf33c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12805,7 +12805,6 @@ in inherit (callPackages ../applications/networking/browsers/firefox { inherit (gnome2) libIDL; - inherit (pythonPackages) pysqlite; libpng = libpng_apng; enableGTK3 = false; }) firefox-unwrapped firefox-esr-unwrapped;