Merge pull request #258429 from FliegendeWurst/wavebox-117.18-2

authored by Artturi and committed by GitHub a3987f51 c1cfba58

+33 -22
+28 -22
pkgs/applications/networking/instant-messengers/wavebox/default.nix
··· 4 4 , gtk3 5 5 , gtk4 6 6 , libnotify 7 + , copyDesktopItems 7 8 , makeDesktopItem 8 9 , makeWrapper 9 10 , mesa ··· 17 18 , xorg 18 19 }: 19 20 20 - let 21 - version = "10.114.26-2"; 22 - desktopItem = makeDesktopItem rec { 23 - name = "Wavebox"; 24 - exec = "wavebox"; 25 - icon = "wavebox"; 26 - desktopName = name; 27 - genericName = name; 28 - categories = [ "Network" "WebBrowser" ]; 29 - }; 21 + stdenv.mkDerivation rec { 22 + pname = "wavebox"; 23 + version = "10.118.5-2"; 30 24 31 - tarball = "Wavebox_${version}.tar.gz"; 32 - 33 - in 34 - stdenv.mkDerivation { 35 - pname = "wavebox"; 36 - inherit version; 37 25 src = fetchurl { 38 - url = "https://download.wavebox.app/stable/linux/tar/${tarball}"; 39 - sha256 = "1yk664zgahjg6n98n3kc9avcay0nqwcyq8wq231p7kvd79zazk0r"; 26 + url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz"; 27 + sha256 = "sha256-TxMl8pdycCMY6NFi5MSLZg0p/+KmuAPQOm370bPMm/0="; 40 28 }; 41 29 42 30 # don't remove runtime deps 43 31 dontPatchELF = true; 32 + # ignore optional Qt 6 shim 33 + autoPatchelfIgnoreMissingDeps = [ "libQt6Widgets.so.6" "libQt6Gui.so.6" "libQt6Core.so.6" ]; 44 34 45 - nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook ]; 35 + nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook copyDesktopItems ]; 46 36 47 37 buildInputs = with xorg; [ 48 38 libXdmcp ··· 62 52 63 53 runtimeDependencies = [ (lib.getLib udev) libnotify gtk4 ]; 64 54 55 + desktopItems = [ 56 + (makeDesktopItem rec { 57 + name = "Wavebox"; 58 + exec = "wavebox"; 59 + icon = "wavebox"; 60 + desktopName = name; 61 + genericName = name; 62 + categories = [ "Network" "WebBrowser" ]; 63 + }) 64 + ]; 65 + 65 66 installPhase = '' 67 + runHook preInstall 68 + 66 69 mkdir -p $out/bin $out/opt/wavebox 67 70 cp -r * $out/opt/wavebox 68 71 69 - # provide desktop item and icon 70 - mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps 71 - ln -s ${desktopItem}/share/applications/* $out/share/applications 72 + # provide icon for desktop item 73 + mkdir -p $out/share/icons/hicolor/128x128/apps 72 74 ln -s $out/opt/wavebox/product_logo_128.png $out/share/icons/hicolor/128x128/apps/wavebox.png 75 + 76 + runHook postInstall 73 77 ''; 74 78 75 79 postFixup = '' 76 80 makeWrapper $out/opt/wavebox/wavebox-launcher $out/bin/wavebox \ 77 81 --prefix PATH : ${xdg-utils}/bin 78 82 ''; 83 + 84 + passthru.updateScript = ./update.sh; 79 85 80 86 meta = with lib; { 81 87 description = "Wavebox messaging application";
+5
pkgs/applications/networking/instant-messengers/wavebox/update.sh
··· 1 + #!/usr/bin/env nix-shell 2 + #!nix-shell -i bash -p nix-update curl jq 3 + 4 + version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["tar"] | match("https://download.wavebox.app/stable/linux/tar/Wavebox_(.+).tar.gz").captures[0]["string"]') 5 + nix-update wavebox --version "$version"