about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Nortung <alex_nortung@live.dk>2022-08-21 19:45:25 +0200
committerAlexander Nortung <alex_nortung@live.dk>2022-08-21 19:46:48 +0200
commitbc3d4bb2956eadef8452b06542b2d3b9ecdf5a40 (patch)
tree4d58ca55966292e55b6a95000378b729dde69e17
parent03317d0edb637b3106327f2ac2343dbdd7b9bdda (diff)
session-desktop: refactor
Renamed session-desktop-appimage to session-desktop
-rw-r--r--pkgs/applications/networking/instant-messengers/session-desktop/default.nix (renamed from pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix)8
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
index 3ce0054c30250..0f1e9f9e8ad9f 100644
--- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
@@ -9,7 +9,7 @@
 
 let
   version = "1.9.1";
-  pname = "session-desktop-appimage";
+  pname = "session-desktop";
 
   src = fetchurl {
     url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
@@ -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/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54a73b520bcc6..a9f71a341ec11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25602,7 +25602,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 { };