Merge branch 'main' into bot/handy-0.7.10

modules/pkgs/handy.nix

@@ -2,11 +2,11 @@
   perSystem = {pkgs, ...}: {
     packages.handy = pkgs.appimageTools.wrapType2 rec {
       pname = "handy";
-      version = "0.7.9";
+      version = "0.7.10";
 
       src = pkgs.fetchurl {
         url = "https://github.com/cjpais/Handy/releases/download/v${version}/Handy_${version}_amd64.AppImage";
-        hash = "sha256-iSibRpme8xJfumhjJ2LzkrtFwV8j9nHajMnBygBFLz4=";
+        hash = "sha256-vBOcXCCJr9D0u0h27nN4XLPPngx4m+toAfi6O6Fuojk=";
       };
 
       extraInstallCommands = let

modules/pkgs/zen-browser.nix

@@ -1,44 +1,41 @@
-{ ... }: {
+{ lib, ... }: {
   perSystem = { pkgs, ... }: let
-    zen-appimage = pkgs.appimageTools.wrapType2 rec {
+    pname = "zen-browser";
-      pname = "zen-browser";
+    version = "1.19.1b";
-      version = "1.19.1b";
 
-      src = pkgs.fetchurl {
+    src = pkgs.fetchurl {
-        url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-x86_64.AppImage";
+      url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-x86_64.AppImage";
-        hash = "sha256-h3lza2C+SxptpcX897Uf/nM8dNILUBXScSNQZlvSIQg=";
+      hash = "sha256-h3lza2C+SxptpcX897Uf/nM8dNILUBXScSNQZlvSIQg=";
-      };
+    };
 
-      extraInstallCommands = let
+    appimageContents = pkgs.appimageTools.extract { inherit pname version src; };
-        contents = pkgs.appimageTools.extract { inherit pname version src; };
+  in {
-      in ''
+    packages.zen-browser = pkgs.appimageTools.wrapType2 {
-        desktop_file=$(find ${contents} -name "*.desktop" | head -n1)
+      inherit pname version src;
+
+      extraPkgs = pkgs: [ pkgs.ffmpeg-full ];
+
+      extraInstallCommands = ''
+        desktop_file=$(find ${appimageContents} -name "*.desktop" | head -n1)
         if [ -n "$desktop_file" ]; then
           install -m 444 -D "$desktop_file" "$out/share/applications/${pname}.desktop"
-          # The desktop file uses 'zen' as the binary name
           substituteInPlace "$out/share/applications/${pname}.desktop" \
             --replace 'Exec=zen' 'Exec=${pname}'
         fi
 
-        if [ -d ${contents}/usr/share/icons ]; then
+        if [ -d ${appimageContents}/usr/share/icons ]; then
-          cp -r ${contents}/usr/share/icons $out/share
+          cp -r ${appimageContents}/usr/share/icons $out/share
         fi
 
-        # Also provide 'zen' binary since some apps expect it
         ln -s $out/bin/${pname} $out/bin/zen
       '';
-    };
+
-  in {
+      meta = {
-    packages.zen-browser = pkgs.symlinkJoin {
+        description = "Experience tranquillity while browsing the web without people tracking you!";
-      name = "zen-browser";
+        homepage = "https://zen-browser.app";
-      paths = [ zen-appimage ];
+        license = lib.licenses.mpl20;
-      buildInputs = [ pkgs.makeWrapper ];
+        platforms = [ "x86_64-linux" ];
-      postBuild = ''
+      };
-        wrapProgram $out/bin/zen-browser \
-          --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.ffmpeg ]}
-        wrapProgram $out/bin/zen \
-          --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.ffmpeg ]}
-      '';
     };
   };
 }