Unverified Commit f17f4f51 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

librewolf-unwrapped: restore patch application (#388153)

parents 360eefbc 77d77c17

pkgs/applications/networking/browsers/librewolf/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
let

  librewolf-src = callPackage ./librewolf.nix { };

in

(buildMozillaMach rec {

(buildMozillaMach {

  pname = "librewolf";

  applicationName = "LibreWolf";

  binaryName = "librewolf";
@@ -31,6 +31,7 @@ in 
    maintainers = with lib.maintainers; [

      squalus

      dwrege

      fpletz

    ];

    platforms = lib.platforms.unix;

    broken = stdenv.buildPlatform.is32bit;

pkgs/applications/networking/browsers/librewolf/librewolf.nix

+16 −6
Original line number Diff line number Diff line
@@ -10,26 +10,36 @@ rec { 


  extraConfigureFlags = [

    "--with-unsigned-addon-scopes=app,system"

    "--disable-default-browser-agent"

  ];



  extraPostPatch = ''

    while read patch_name; do

      if ! sed -n '/nvidia-wayland-backported-fixes-.*-Bug-1898476/p'; then

      echo "applying LibreWolf patch: $patch_name"

      patch -p1 < ${source}/$patch_name

      fi

    done <${source}/assets/patches.txt



    cp -r ${source}/themes/browser .

    cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json

    sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure

    sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure



    cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences

    cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences

    cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences

    cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences

    cat ${source}/browser/preferences/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl



    # override firefox version

    for fn in browser/config/version.txt browser/config/version_display.txt; do

      echo "${packageVersion}" > "$fn"

    done



    echo "patching appstrings.properties"

    find . -path '*/appstrings.properties' -exec sed -i s/Firefox/LibreWolf/ {} \;



    for fn in $(find "${source}/l10n/en-US/browser" -type f -name '*.inc.ftl'); do

      target_fn=$(echo "$fn" | sed "s,${source}/l10n,browser/locales," | sed "s,\.inc\.ftl$,.ftl,")

      cat "$fn" >> "$target_fn"

    done

  '';



  extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ];

pkgs/applications/networking/browsers/librewolf/src.json

+3 −3
Original line number Diff line number Diff line 
{

  "packageVersion": "136.0-1",

  "packageVersion": "136.0-2",

  "source": {

    "rev": "136.0-1",

    "hash": "sha256-ELxcS33lYgYcBUjpfDBMGZfeWanUzcUb3gXI2kEE7O0="

    "rev": "136.0-2",

    "hash": "sha256-X5DkaqqwZF4piRg/KPoV/SS1DtDG6AqR89UeWqFxZX0="

  },

  "firefox": {

    "version": "136.0",