diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-11-18 22:25:34 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-11-22 14:37:51 -0300 |
commit | 4041bc18302d1ee695abf606c33490ea2391fbe8 (patch) | |
tree | f146ec0333317193b8f260e4a922c6ee8a59bb29 | |
parent | 1b7dd40a676b1b48e7db0197bc4ab321d7c14aef (diff) | |
download | nixpkgs-4041bc18302d1ee695abf606c33490ea2391fbe8.tar nixpkgs-4041bc18302d1ee695abf606c33490ea2391fbe8.tar.gz nixpkgs-4041bc18302d1ee695abf606c33490ea2391fbe8.tar.bz2 nixpkgs-4041bc18302d1ee695abf606c33490ea2391fbe8.tar.lz nixpkgs-4041bc18302d1ee695abf606c33490ea2391fbe8.tar.xz nixpkgs-4041bc18302d1ee695abf606c33490ea2391fbe8.tar.zst nixpkgs-4041bc18302d1ee695abf606c33490ea2391fbe8.zip |
palemoon: 29.4.1 -> 29.4.2.1
-rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 94 |
1 files changed, 50 insertions, 44 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 5231b0a0f93..c41e40b6f83 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,37 +1,36 @@ -{ stdenv -, lib -, fetchzip -, writeScript +{ lib +, stdenv , alsa-lib , autoconf213 , cairo -, desktop-file-utils , dbus , dbus-glib +, desktop-file-utils +, fetchzip , ffmpeg , fontconfig , freetype , gnome2 , gnum4 -, gtk2 -, libevent , libGL , libGLU +, libevent , libnotify , libpulseaudio , libstartup_notification +, pango , perl , pkg-config , python2 , unzip , which , wrapGAppsHook +, writeScript , xorg , yasm , zip , zlib -, withGTK3 ? true -, gtk3 +, withGTK3 ? true, gtk3, gtk2 }: # Only specific GCC versions are supported with branding @@ -43,38 +42,16 @@ assert with lib.strings; ( && versionOlder stdenv.cc.version "11" ); -let - libPath = lib.makeLibraryPath [ - ffmpeg - libpulseaudio - ]; - gtkVersion = if withGTK3 then "3" else "2"; -in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.1"; + version = "29.4.2.1"; src = fetchzip { - url = "http://archive.palemoon.org/source/palemoon-${version}-source.tar.xz"; - stripRoot = false; - sha256 = "0kb9yn1q8rrmnlsyvxvv2gdgyyf12g6rxlyh82lmc0gysvd4qd2c"; + name = "${pname}-${version}"; + url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; + sha256 = "sha256-iTn1jbbsw7u+rVe/1J9yJbS0wi5Rlkcy4rO8nWcXu2I="; }; - passthru.updateScript = writeScript "update-${pname}" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl libxml2 - - set -eu -o pipefail - - # Only release note announcement == finalized release - version="$( - curl -s 'http://www.palemoon.org/releasenotes.shtml' | - xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 | - sed 's/v\(\S*\).*/\1/' - )" - update-source-version ${pname} "$version" - ''; - nativeBuildInputs = [ autoconf213 desktop-file-utils @@ -99,12 +76,13 @@ stdenv.mkDerivation rec { freetype gnome2.GConf gtk2 - libevent libGL libGLU + libevent libnotify libpulseaudio libstartup_notification + pango zlib ] ++ (with xorg; [ @@ -118,10 +96,16 @@ stdenv.mkDerivation rec { pixman xorgproto ]) - ++ lib.optional withGTK3 gtk3; + ++ lib.optionals withGTK3 [ + gtk3 + ]; enableParallelBuilding = true; + postPatch = '' + patchShebangs ./mach + ''; + configurePhase = '' runHook preConfigure @@ -135,8 +119,8 @@ stdenv.mkDerivation rec { # Clear this if not a 64bit build _BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"} - # Set GTK Version to 2 or 3 - _GTK_VERSION=${gtkVersion} + # Set GTK Version + _GTK_VERSION=${if withGTK3 then "3" else "2"} # Standard build options for Pale Moon ac_add_options --enable-application=palemoon @@ -212,14 +196,22 @@ stdenv.mkDerivation rec { dontWrapGApps = true; - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${libPath}" - ) + preFixup = + let + libPath = lib.makeLibraryPath [ + ffmpeg + libpulseaudio + ]; + in + '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${libPath}" + ) wrapGApp $out/lib/palemoon-${version}/palemoon ''; meta = with lib; { + homepage = "https://www.palemoon.org/"; description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on @@ -232,10 +224,24 @@ stdenv.mkDerivation rec { experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own. ''; - homepage = "https://www.palemoon.org/"; changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; license = licenses.mpl20; maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; + + passthru.updateScript = writeScript "update-${pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl libxml2 + + set -eu -o pipefail + + # Only release note announcement == finalized release + version="$( + curl -s 'http://www.palemoon.org/releasenotes.shtml' | + xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 | + sed 's/v\(\S*\).*/\1/' + )" + update-source-version ${pname} "$version" + ''; } |