diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-21 12:25:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-21 12:25:23 +0200 |
commit | 2b86087644627436323510fb486b63c0f62ee432 (patch) | |
tree | 15dcb421abdefd10408737326ee842b3dad7712e | |
parent | ab844b28e3aaef29b36ff4c08254c795e0b157e6 (diff) | |
parent | eb700f7a9315c4a3e78eb58aae9f49b1e10040dd (diff) | |
download | nixpkgs-2b86087644627436323510fb486b63c0f62ee432.tar nixpkgs-2b86087644627436323510fb486b63c0f62ee432.tar.gz nixpkgs-2b86087644627436323510fb486b63c0f62ee432.tar.bz2 nixpkgs-2b86087644627436323510fb486b63c0f62ee432.tar.lz nixpkgs-2b86087644627436323510fb486b63c0f62ee432.tar.xz nixpkgs-2b86087644627436323510fb486b63c0f62ee432.tar.zst nixpkgs-2b86087644627436323510fb486b63c0f62ee432.zip |
Merge pull request #91194 from jtojnar/thunderbird-cleanup
5 files changed, 7 insertions, 36 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 27eba126de9..cb442f67359 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -8,7 +8,6 @@ , dbus , fontconfig , freetype -, gconf , gdk-pixbuf , glib , glibc @@ -27,9 +26,7 @@ , libXinerama , libXrender , libXt -, libcanberra-gtk2 -, libgnome -, libgnomeui +, libcanberra , libnotify , gnome3 , libGLU, libGL @@ -103,7 +100,6 @@ stdenv.mkDerivation { dbus fontconfig freetype - gconf gdk-pixbuf glib glibc @@ -122,9 +118,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra-gtk2 - libgnome - libgnomeui + libcanberra libnotify libGLU libGL nspr diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8060895a2e0..0eda0739eab 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -2,7 +2,7 @@ , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: -{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper @@ -104,7 +104,7 @@ stdenv.mkDerivation ({ patchFlags = [ "-p1" "-l" ]; buildInputs = [ - gtk2 perl zip libIDL libjpeg zlib bzip2 + gtk2 perl zip libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU libGL diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e9217c84fc6..ba13d666ad9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, config, makeWrapper -, gconf , alsaLib , at-spi2-atk , atk @@ -13,8 +12,6 @@ , gdk-pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -30,9 +27,7 @@ , libXrender , libXt , libxcb -, libcanberra-gtk2 -, libgnome -, libgnomeui +, libcanberra , gnome3 , libGLU, libGL , nspr @@ -82,7 +77,6 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc - gconf alsaLib at-spi2-atk atk @@ -96,8 +90,6 @@ stdenv.mkDerivation { gdk-pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos @@ -113,9 +105,7 @@ stdenv.mkDerivation { libXrender libXt libxcb - libcanberra-gtk2 - libgnome - libgnomeui + libcanberra libGLU libGL nspr nss diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 73536ae5fc1..e9ae6696def 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -18,7 +18,6 @@ , lib , libGL , libGLU -, libIDL , libevent , libjpeg , libnotify @@ -113,7 +112,6 @@ stdenv.mkDerivation rec { jemalloc libGL libGLU - libIDL libevent libjpeg libnotify diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e31c42261e7..d122dce6282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19773,7 +19773,6 @@ in firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = pkgs.newScope { - inherit (gnome2) libIDL; libpng = libpng_apng; python = python2; gnused = gnused_422; @@ -19794,8 +19793,6 @@ in firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -19807,8 +19804,6 @@ in firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -19820,8 +19815,6 @@ in firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { @@ -22475,7 +22468,6 @@ in thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (gnome2) libIDL; inherit (rustPackages_1_42) rustc; libpng = libpng_apng; gtk3Support = true; @@ -22483,10 +22475,7 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; - }; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; ticpp = callPackage ../development/libraries/ticpp { }; |