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

thunderbird: use python2

Browse Source 
and remove pysqlite since its part of the standard library.
This commit is contained in:
Frederik Rietdijk 2016-11-18 14:16:28 +01:00
parent 2887a633f7
commit 8fb430ca86
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python, zip, libIDL { stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , libjpeg, libpng, 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 , cairo, gstreamer, gst_plugins_base, icu
, debugBuild ? false , debugBuild ? false
@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
[ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xorg.libXi python2 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 cairo icu hunspell libevent libstartup_notification cairo icu
] ++ [ m4 ]; ] ++ [ m4 ];

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

@ -14825,7 +14825,6 @@ in
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
inherit (gnome2) libIDL; inherit (gnome2) libIDL;
inherit (pythonPackages) pysqlite;
libpng = libpng_apng; libpng = libpng_apng;
}; };