diff options
| author | Christoph Neidahl <christoph.neidahl@gmail.com> | 2019-12-31 04:32:43 +0100 |
|---|---|---|
| committer | Christoph Neidahl <christoph.neidahl@gmail.com> | 2019-12-31 04:32:43 +0100 |
| commit | f7bd1742f18bfb9d6e996459b2da9a25dbb75385 (patch) | |
| tree | 5e18490405d5d9d47a0196303226c8a692e5d3e6 | |
| parent | cfd013813e97f9bdef009a7d0f891872275e4da2 (diff) | |
| download | nixpkgs-f7bd1742f18bfb9d6e996459b2da9a25dbb75385.tar nixpkgs-f7bd1742f18bfb9d6e996459b2da9a25dbb75385.tar.gz nixpkgs-f7bd1742f18bfb9d6e996459b2da9a25dbb75385.tar.bz2 nixpkgs-f7bd1742f18bfb9d6e996459b2da9a25dbb75385.tar.lz nixpkgs-f7bd1742f18bfb9d6e996459b2da9a25dbb75385.tar.xz nixpkgs-f7bd1742f18bfb9d6e996459b2da9a25dbb75385.tar.zst nixpkgs-f7bd1742f18bfb9d6e996459b2da9a25dbb75385.zip | |
palemoon: use gcc7, remove build notification
Changes as requested in https://github.com/NixOS/nixpkgs/pull/69206
| -rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index ae3999e3cda..21dd04610cd 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -55,6 +55,7 @@ in stdenv.mkDerivation rec { configurePhase = '' export MOZBUILD_STATE_PATH=$(pwd)/mozbuild export MOZCONFIG=$(pwd)/mozconfig + export MOZ_NOSPAM=1 export builddir=$(pwd)/pmbuild echo > $MOZCONFIG " diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d751d907aee..d245c52b4b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20621,8 +20621,8 @@ in osmo = callPackage ../applications/office/osmo { }; palemoon = callPackage ../applications/networking/browsers/palemoon { - # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 - stdenv = gcc49Stdenv; + # https://www.palemoon.org/sourcecode.shtml + stdenv = gcc7Stdenv; }; pamix = callPackage ../applications/audio/pamix { }; |