Unverified Commit 4a366ec4 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #323305 from eclairevoyant/fix-name-for-appimages 

treewide: fix name for appimages
parents 53df5c00 243e565d

pkgs/applications/blockchains/trezor-suite/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
let

  pname = "trezor-suite";

  version = "24.6.2";

  name = "${pname}-${version}";



  suffix = {

    aarch64-linux = "linux-arm64";
@@ -17,7 +16,7 @@ let 
  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");



  src = fetchurl {

    url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";

    url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";

    hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'

      aarch64-linux = "sha512-fJnka//9DbvTTq7GEN++6thU8f8BL4cHh1J4P/Tu9Eu94KWCHDG2IwFALOXEvZnwLbxFYiu3Cqldp2RIxYFXTA==";

      x86_64-linux  = "sha512-/gRQR1EriiwrDj04BTnhXlsawJgHp6TqgHpgVCMO1r+U2zGiFLdNfwG/SYwARE+55X8Umls5hCt/wuCpTEPkEg==";
@@ -25,16 +24,15 @@ let 
  };



  appimageContents = appimageTools.extractType2 {

    inherit name src;

    inherit pname version src;

  };



in



appimageTools.wrapType2 rec {

  inherit name src;

  inherit pname version src;



  extraInstallCommands = ''

    mv $out/bin/${name} $out/bin/${pname}

    mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources



    cp -a ${appimageContents}/locales/ $out/share/${pname}

pkgs/applications/misc/mobilecoin-wallet/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -3,21 +3,18 @@ 
let

  pname = "mobilecoin-wallet";

  version = "1.8.0";

  name = "${pname}-${version}";

  src = fetchurl {

    url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage";

    hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs=";

  };

  appimageContents = appimageTools.extractType2 { inherit name src; };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };



in appimageTools.wrapType2 {

  inherit name src;

  inherit pname version src;



  extraPkgs = pkgs: [ pkgs.libsecret ];



  extraInstallCommands = ''

    mv $out/bin/${name} $out/bin/${pname}



    mkdir -p $out/share/${pname}

    cp -a ${appimageContents}/locales $out/share/${pname}

    cp -a ${appimageContents}/resources $out/share/${pname}

pkgs/applications/networking/cluster/lens/linux.nix

+2 −6
Original line number Diff line number Diff line 
{ pname, version, src, meta, appimageTools, makeWrapper }:

let



  name = "${pname}-${version}";



  appimageContents = appimageTools.extractType2 {

    inherit name src;

    inherit pname version src;

  };



in



appimageTools.wrapType2 {

  inherit name src meta;

  inherit pname version src meta;



  extraInstallCommands =

    ''

      mv $out/bin/${name} $out/bin/${pname}

      source "${makeWrapper}/nix-support/setup-hook"

      wrapProgram $out/bin/${pname} \

        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

pkgs/applications/networking/instant-messengers/beeper/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
let

  pname = "beeper";

  version = "3.106.2";

  name = "${pname}-${version}";

  src = fetchurl {

    url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage";

    hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M=";
@@ -25,7 +24,7 @@ let 
  };

in

stdenvNoCC.mkDerivation rec {

  inherit name pname version;

  inherit pname version;



  src = appimage;

pkgs/applications/networking/instant-messengers/ripcord/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ mkDerivation rec { 
      name = "${pname}-${version}.AppImage";

    };

  in appimageTools.extract {

    name = "${pname}-${version}";

    inherit pname version;

    src = appimage;

  };