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

palemoon: just use the default gcc

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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