b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #187336 from Alexnortung/session-desktop-appimage

Browse source 
session-desktop-appimage: 1.8.6 -> 1.9.1
This commit is contained in:
Christian Kögler 2022-08-31 22:00:09 +02:00 committed by GitHub
parent df05f7eeeb 838d46c003
commit 56e8e486f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix → pkgs/applications/networking/instant-messengers/session-desktop/default.nix
View file

@ -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

1
pkgs/top-level/aliases.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };