palemoon: just use the default gcc

This commit is contained in:
Jan Malakhovski 2017-09-15 21:03:47 +00:00 committed by Tuomas Tynkkynen
parent 21e135c8bd
commit 701db44ab9
2 changed files with 3 additions and 6 deletions

View file

@ -5,7 +5,7 @@
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
, libstartup_notification, libvpx, makeWrapper, mesa
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
, unzip, xlibs, which, yasm, zip, zlib, gcc
, unzip, xlibs, which, yasm, zip, zlib
}:
stdenv.mkDerivation rec {
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
libpulseaudio sqlite unzip which yasm zip zlib gcc
libpulseaudio sqlite unzip which yasm zip zlib
] ++ (with xlibs; [
libX11 libXext libXft libXi libXrender libXScrnSaver
libXt pixman scrnsaverproto xextproto

View file

@ -15671,10 +15671,7 @@ with pkgs;
osquery = callPackage ../tools/system/osquery { };
palemoon = callPackage ../applications/networking/browsers/palemoon {
# https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146
stdenv = overrideCC stdenv gcc49;
};
palemoon = callPackage ../applications/networking/browsers/palemoon { };
pamix = callPackage ../applications/audio/pamix { };