diff options
Diffstat (limited to 'pkgs/applications/networking/browsers/palemoon/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 9f2eda4c3baf..542d43294815 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -2,7 +2,7 @@ , pkgconfig, autoconf213, alsaLib, bzip2, cairo , dbus, dbus-glib, ffmpeg_3, 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,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.13.0"; + version = "28.15.0"; src = fetchFromGitHub { + githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1lza6239kb32wnwd9cwddn11npg1qx7p69l7qy63h9c59w29iypa"; + sha256 = "1sbs3gcwfx58mxc0x1g6jklmvpa9dw2bq3i8y9645gfa1s12p8wy"; fetchSubmodules = true; }; @@ -42,7 +43,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 +127,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; { |