Unverified Commit 7e7c39ea authored by Marcus Ramberg's avatar Marcus Ramberg Committed by GitHub
Browse files

Merge pull request #326101 from christoph-heiss/floorp-update 

floorp: 11.14.1 -> 11.15.0
parents fd6a510e e12df250

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

+9 −5
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ 
, fetchFromGitHub

, buildMozillaMach

, nixosTests

, python311

}:



((buildMozillaMach rec {

  pname = "floorp";

  packageVersion = "11.14.1";

  packageVersion = "11.15.0";

  applicationName = "Floorp";

  binaryName = "floorp";

  branding = "browser/branding/official";
@@ -22,7 +23,7 @@ 
    repo = "Floorp";

    fetchSubmodules = true;

    rev = "v${packageVersion}";

    hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0=";

    hash = "sha256-LRuts3O3Rj5e6rT9gKTTwAIsY0oSziuiZ3rzE7wHa7o=";

  };



  extraConfigureFlags = [
@@ -32,10 +33,12 @@ 
  ];



  extraPostPatch = ''

    # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin

    # https://github.com/NixOS/nixpkgs/issues/314115

    # Fix .desktop files for PWAs generated by Floorp

    # The executable path returned by Services.dirsvc.get() is absolute and

    # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each

    # update, rely on `floorp` being in $PATH, as before.

    substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \

      --replace-fail /usr/bin/floorp floorp

      --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' floorp

  '';



  updateScript = ./update.sh;
@@ -61,6 +64,7 @@ 
  enableOfficialBranding = false;

  googleAPISupport = true;

  mlsAPISupport = true;

  python3 = python311;

}).overrideAttrs (prev: {

  MOZ_DATA_REPORTING = "";

  MOZ_TELEMETRY_REPORTING = "";