Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d74573d8ae6f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0fd4e3c87705
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 10, 2020

  1. palemoon: 28.13.0 -> 28.14.2 

    (cherry picked from commit 559cf21)
    @OPNA2608
    OPNA2608 committed Oct 10, 2020
    Copy the full SHA
    deebf77 View commit details

Commits on Oct 11, 2020

  1. Merge pull request #100183 from OPNA2608/update/palemoon-28.14.2@20.03 

    [20.03] palemoon: 28.13.0 -> 28.14.2
    @AndersonTorres
    AndersonTorres authored Oct 11, 2020
    Copy the full SHA
    0fd4e3c View commit details
Showing with 11 additions and 5 deletions.
  1. +11 −5 pkgs/applications/networking/browsers/palemoon/default.nix
16 changes: 11 additions & 5 deletions pkgs/applications/networking/browsers/palemoon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
, libnotify, libstartup_notification, makeWrapper
, libnotify, libstartup_notification, wrapGAppsHook
, libGLU, libGL, perl, python2, libpulseaudio
, unzip, xorg, wget, which, yasm, zip, zlib

@@ -16,13 +16,13 @@ let

in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.13.0";
version = "28.14.2";

src = fetchFromGitHub {
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
sha256 = "1lza6239kb32wnwd9cwddn11npg1qx7p69l7qy63h9c59w29iypa";
sha256 = "1qz2sqc8rcg5z5kncabgmpl6v4i6wrs9dlgmna69255qrmsshwgm";
fetchSubmodules = true;
};

@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
'';

nativeBuildInputs = [
desktop-file-utils file gnum4 makeWrapper perl pkgconfig python2 wget which
desktop-file-utils file gnum4 perl pkgconfig python2 wget which wrapGAppsHook
];

buildInputs = [
@@ -126,9 +126,15 @@ in stdenv.mkDerivation rec {
size=$n"x"$n
install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
done
'';

dontWrapGApps = true;

wrapProgram $out/lib/palemoon-${version}/palemoon \
preFixup = ''
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${libPath}"
)
wrapGApp $out/lib/palemoon-${version}/palemoon
'';

meta = with lib; {