From 3e5290a6ba19560bec9d7b3ff0016c05ab8e640c Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 25 Aug 2024 15:38:05 -0400 Subject: [PATCH] meta: Move friendlyfox to separate package Makes it easier to do things like update friendlyfox in the future. --- home/librewolf.nix | 34 +--------------------------- packages/friendlyfox.nix | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 33 deletions(-) create mode 100644 packages/friendlyfox.nix diff --git a/home/librewolf.nix b/home/librewolf.nix index f532f551..97487206 100644 --- a/home/librewolf.nix +++ b/home/librewolf.nix @@ -9,39 +9,7 @@ let inherit (lib) mkIf; - friendlyfox = pkgs.stdenvNoCC.mkDerivation (finalAttrs: { - pname = "mobile-friendly-firefox"; - version = "2.11.1"; - - src = pkgs.fetchFromGitea { - domain = "codeberg.org"; - owner = "user0"; - repo = "Mobile-Friendly-Firefox"; - rev = "v${finalAttrs.version}"; - hash = "sha256-rA5lnfW5zOyfJ6pbcrsTBEhMEof5h/heGaHxST+q+AY="; - }; - - patches = [ - # Fix for Firefox 127 and later (renamed id) - (pkgs.fetchpatch2 { - url = "https://codeberg.org/user0/Mobile-Friendly-Firefox/commit/bfb7946973bf707d0494714679df47ec66017f97.patch"; - hash = "sha256-wJLXgNUUaNHVgCMi8sGnC5cx2yNwZwh2JoDaVMsVehY="; - }) - ]; - - installPhase = '' - runHook preInstall - - install -Dm644 src/userContent/styles/fenix-colors/userContent.css -t $out - cat src/userChrome/fenix_one.css src/userChrome/dynamic_popups_pro.css > $out/userChrome.css - - runHook postInstall - ''; - - postInstall = '' - echo ".urlbarView { display: none !important; }" >> $out/userChrome.css - ''; - }); + friendlyfox = pkgs.callPackage ../packages/friendlyfox.nix { }; in { programs.librewolf = { diff --git a/packages/friendlyfox.nix b/packages/friendlyfox.nix new file mode 100644 index 00000000..bda04833 --- /dev/null +++ b/packages/friendlyfox.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenvNoCC, + fetchFromGitea, + fetchpatch2, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "friendlyfox"; + version = "2.11.1"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "user0"; + repo = "Mobile-Friendly-Firefox"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rA5lnfW5zOyfJ6pbcrsTBEhMEof5h/heGaHxST+q+AY="; + }; + + patches = [ + # Fix for Firefox 127 and later (renamed id) + (fetchpatch2 { + url = "https://codeberg.org/user0/Mobile-Friendly-Firefox/commit/bfb7946973bf707d0494714679df47ec66017f97.patch"; + hash = "sha256-wJLXgNUUaNHVgCMi8sGnC5cx2yNwZwh2JoDaVMsVehY="; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 src/userContent/styles/fenix-colors/userContent.css -t $out + cat src/userChrome/fenix_one.css src/userChrome/dynamic_popups_pro.css > $out/userChrome.css + + runHook postInstall + ''; + + postInstall = '' + echo ".urlbarView { display: none !important; }" >> $out/userChrome.css + ''; + + meta = { + description = "Custom CSS styles for Firefox browsers on Linux, with a focus on mobile devices like Librem 5 and PinePhone"; + license = lib.licenses.mpl20; + homepage = "https://forums.puri.sm/t/tutorial-add-a-custom-background-in-phosh/13385/23"; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.all; + }; +})