diff options
author | Atemu <atemu.main@gmail.com> | 2024-04-24 21:48:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-24 21:48:19 +0200 |
commit | 2432c6b82993fbcaf6e71d84ae172ef40f26c901 (patch) | |
tree | 35414ed351c29d70cbb02acd1af43fe6e72ab15c /pkgs/applications/networking/instant-messengers | |
parent | 512b6bda5bf5bb37bd55752f469493b673624eb6 (diff) | |
parent | 17151c649e3eb0ac1e7be7707f9cfa385029c4c2 (diff) |
Merge pull request #271071 from pbsds/wrapAppImage-pname-redux
appimageTools.wrapAppImage: remove version from `pname`
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
5 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 63d6720aaf0db..06e2a17d564ef 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -35,8 +35,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mv bin/${name} bin/${pname} - mkdir -p $out/ cp -r bin $out/bin diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix index 104f39f4460b0..cceea293adbd3 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -30,8 +30,6 @@ in extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},caprine} - mkdir -p $out/share "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" ln -s ${extracted}/caprine.png $out/share/icons/caprine.png diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/applications/networking/instant-messengers/keet/default.nix index 557078cd8b508..c49442e38370e 100644 --- a/pkgs/applications/networking/instant-messengers/keet/default.nix +++ b/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -14,8 +14,6 @@ in appimageTools.wrapType2 { inherit src pname version; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index bc0afb8b68832..4e8ed9bd0c6c1 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -44,8 +44,6 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - mv bin/session-desktop-${version} bin/session-desktop - mkdir -p $out/ cp -r bin $out/bin diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 81c6a39e27d18..f7bb1ea099cab 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -23,7 +23,6 @@ in appimageTools.wrapType2 { runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"; extraInstallCommands = '' - mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png |