diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix similarity index 82% rename from pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix rename to pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 61166a82f38e..0f1e9f9e8ad9 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.8.6"; - pname = "session-desktop-appimage"; + version = "1.9.1"; + pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "h7uEdxBuqPNWGFp5wWWRI9VsK3HYOtLVgj7rIbeO9kY="; + sha256 = "sha256-Zc3btkvN4ic47IGigeFJGx4dwbM+b7iuIOxpmcWmrRQ="; }; appimage = appimageTools.wrapType2 { inherit version pname src; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { name = "Session"; desktopName = "Session"; comment = "Onion routing based messenger"; - exec = "${appimage}/bin/session-desktop-appimage-${version}"; + exec = "${appimage}/bin/session-desktop-${version}"; icon = "${appimage-contents}/session-desktop.png"; terminal = false; type = "Application"; @@ -44,10 +44,12 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall + mv bin/session-desktop-${version} bin/session-desktop + mkdir -p $out/ cp -r bin $out/bin - wrapProgram $out/bin/session-desktop-appimage-${version} \ + wrapProgram $out/bin/session-desktop \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0550b736e968..47c6302adac5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1288,6 +1288,7 @@ mapAliases ({ sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 + session-desktop-appimage = session-desktop; shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274944aed1e4..167e178e3f3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25780,7 +25780,7 @@ with pkgs; seshat = callPackage ../data/fonts/seshat { }; - session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { }; + session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { }; shaderc = callPackage ../development/compilers/shaderc { };