From 8fc88142fe9a074b5d80350e897996fa723f2b6b Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 15 Jun 2024 20:25:18 +0200 Subject: [PATCH 1/2] floorp: 11.3.3 -> 11.14.1 Release notes: https://blog.ablaze.one/4375/2024-06-00/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.13.3...v11.14.1 Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 9541153d8cc1..bc8c6eabf896 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.13.3"; + packageVersion = "11.14.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -15,14 +15,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.12.0"; + version = "115.13.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-9EDTVckSqv/nyDi4qjMd54I69WiqM8v6om7zQLT+pQc="; + hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; }; extraConfigureFlags = [ From 116ee53f879f036d06235cde0313d6ca9e54d9c0 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sun, 16 Jun 2024 11:43:35 +0200 Subject: [PATCH 2/2] floorp: patch .desktop PWA file command path Floorp hardcodes /usr/bin/floorp as binary path when generating .desktop files for PWAs. That obviously not work for Nix-installed version, so patch it to just refer to "floorp", relying on $PATH. See also #314115. Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index bc8c6eabf896..ff36607709bc 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -31,6 +31,13 @@ "--with-unsigned-addon-scopes=app,system" ]; + extraPostPatch = '' + # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin + # https://github.com/NixOS/nixpkgs/issues/314115 + substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ + --replace-fail /usr/bin/floorp floorp + ''; + updateScript = ./update.sh; meta = {