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

firefox: drop pysqlite dependency

Browse Source 
since our interpreter ships with sqlite
This commit is contained in:
Frederik Rietdijk 2016-10-18 09:07:34 +02:00
parent 9c3fd2c437
commit 37eba07810
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL { lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL
, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
, autoconf213, which , autoconf213, which
@ -34,7 +34,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
python dbus dbus_glib pango freetype fontconfig xorg.libXi python dbus dbus_glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
alsaLib nspr nss libnotify xorg.pixman yasm mesa alsaLib nspr nss libnotify xorg.pixman yasm mesa
xorg.libXScrnSaver xorg.scrnsaverproto pysqlite xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx /* cairo */ hunspell libevent libstartup_notification libvpx /* cairo */
icu libpng jemalloc icu libpng jemalloc

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

@ -12805,7 +12805,6 @@ in
inherit (callPackages ../applications/networking/browsers/firefox { inherit (callPackages ../applications/networking/browsers/firefox {
inherit (gnome2) libIDL; inherit (gnome2) libIDL;
inherit (pythonPackages) pysqlite;
libpng = libpng_apng; libpng = libpng_apng;
enableGTK3 = false; enableGTK3 = false;
}) firefox-unwrapped firefox-esr-unwrapped; }) firefox-unwrapped firefox-esr-unwrapped;