diff options
90 files changed, 55 insertions, 210 deletions
diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 258a9cd2065af..b9a688370dcd1 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -12,8 +12,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $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}}" diff --git a/pkgs/applications/audio/museeks/default.nix b/pkgs/applications/audio/museeks/default.nix index 206fee9de709b..5db7f5bd40844 100644 --- a/pkgs/applications/audio/museeks/default.nix +++ b/pkgs/applications/audio/museeks/default.nix @@ -17,8 +17,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/usr/share/icons $out/share/ diff --git a/pkgs/applications/audio/nuclear/default.nix b/pkgs/applications/audio/nuclear/default.nix index 605596563e0b6..2d6a4384e747e 100644 --- a/pkgs/applications/audio/nuclear/default.nix +++ b/pkgs/applications/audio/nuclear/default.nix @@ -21,10 +21,6 @@ appimageTools.wrapType2 { substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share - - # unless linked, the binary is placed in $out/bin/nuclear-someVersion - # link it to $out/bin/nuclear - ln -s $out/bin/${pname}-${version} $out/bin/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index c3d36d3b38368..245760be5f70a 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -20,7 +20,6 @@ in appimageTools.wrapType2 { extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ $out/share/icons/hicolor/512x512/apps/plexamp.png diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index 87ceb7b25e0f4..e535a574ab9a2 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -16,8 +16,6 @@ appimageTools.wrapType2 rec { inherit pname version src; 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 --no-sandbox %U' 'Exec=${pname}' @@ -33,4 +31,3 @@ appimageTools.wrapType2 rec { mainProgram = "sonixd"; }; } - diff --git a/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/pkgs/applications/blockchains/crypto-org-wallet/default.nix index 1460d87d932bf..6132fd9af3ecc 100644 --- a/pkgs/applications/blockchains/crypto-org-wallet/default.nix +++ b/pkgs/applications/blockchains/crypto-org-wallet/default.nix @@ -3,19 +3,17 @@ let pname = "chain-desktop-wallet"; version = "0.1.1"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/crypto-com/${pname}/releases/download/v${version}/${name}-x86_64.AppImage"; + url = "https://github.com/crypto-com/${pname}/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; sha256 = "12076hf8dlz0hg1pb2ixwlslrh8gi6s1iawnvhnn6vz4jmjvq356"; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop ${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/applications/blockchains/framesh/default.nix index f866ff3ea98ca..6c39d9d212d66 100644 --- a/pkgs/applications/blockchains/framesh/default.nix +++ b/pkgs/applications/blockchains/framesh/default.nix @@ -16,7 +16,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d2e9094afa61c..d49902c9d5ac6 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -17,7 +17,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index fada1835bfb17..607ecf23c3622 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -5,7 +5,6 @@ let pname = "MyCrypto"; version = "1.7.17"; sha256 = "20eb48989b5ae5e60e438eff6830ac79a0d89ac26dff058097260e747e866444"; # Taken from release's checksums.txt.gpg - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage"; @@ -13,7 +12,7 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; desktopItem = makeDesktopItem { @@ -26,14 +25,12 @@ let }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; multiArch = false; # no p32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - mkdir -p $out/share cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons chmod -R +w $out/share diff --git a/pkgs/applications/blockchains/zecwallet-lite/default.nix b/pkgs/applications/blockchains/zecwallet-lite/default.nix index 27004722c38e2..2b51f76ffcca9 100644 --- a/pkgs/applications/blockchains/zecwallet-lite/default.nix +++ b/pkgs/applications/blockchains/zecwallet-lite/default.nix @@ -12,8 +12,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${contents}/zecwallet-lite.desktop -t $out/share/applications substituteInPlace $out/share/applications/zecwallet-lite.desktop \ --replace 'Exec=AppRun' "Exec=$out/bin/zecwallet-lite" diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index 6e663e1e317b2..6b3808e37dcf0 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -19,7 +19,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix index 825ea4c51e190..552f56a6b5c42 100644 --- a/pkgs/applications/graphics/pureref/default.nix +++ b/pkgs/applications/graphics/pureref/default.nix @@ -12,10 +12,6 @@ appimageTools.wrapType1 rec { curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out ''; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - ''; - meta = with lib; { description = "Reference Image Viewer"; homepage = "https://www.pureref.com"; diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 9675f4cf17dcc..224542f14e7b0 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -26,8 +26,6 @@ in cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png - mv $out/bin/${pname}-${version} $out/bin/${pname} - substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' ''; diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index 128c668eb0a51..7387bc212c649 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -37,8 +37,6 @@ appimageTools.wrapAppImage rec { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - mv $out/bin/bazecor-* $out/bin/bazecor - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications substituteInPlace $out/share/applications/Bazecor.desktop \ --replace 'Exec=Bazecor' 'Exec=bazecor' diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index 55fe2b9e2cf79..c6307cb3fa9a1 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -3,7 +3,6 @@ let version = "0.7.2"; pname = "devdocs-desktop"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; @@ -11,14 +10,13 @@ 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} install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop install -m 444 -D ${appimageContents}/devdocs.png $out/share/icons/hicolor/0x0/apps/devdocs.png substituteInPlace $out/share/applications/devdocs.desktop \ diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index 9df2118b02fb7..41cd6c42a5b3f 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -16,7 +16,6 @@ in appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications $out/share/pixmaps - mv $out/bin/${pname}-${version} $out/bin/firefly-desktop cp ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop substituteInPlace $out/share/applications/firefly-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=firefly-desktop' \ diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/applications/misc/fspy/default.nix index 1a4504d5608c0..96178649efe7f 100644 --- a/pkgs/applications/misc/fspy/default.nix +++ b/pkgs/applications/misc/fspy/default.nix @@ -11,10 +11,6 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - ''; - meta = with lib; { description = "A cross platform app for quick and easy still image camera matching"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index ff46b57e1a3ce..308f43b7d4634 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -17,7 +17,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/GoldenCheetah + mv $out/bin/${pname} $out/bin/GoldenCheetah mkdir -p $out/share/applications mkdir -p $out/share/pixmaps cp ${appimageContents}/GoldenCheetah.desktop $out/share/applications/ diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index a8245a2234669..55acb6ef0db2a 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -52,7 +52,6 @@ let multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 017eb17a40ad1..4bdb6cca92cae 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -18,8 +18,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index bc9418d57838e..647e833e69604 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -27,9 +27,6 @@ appimageTools.wrapType2 rec { ]; extraInstallCommands = '' - # Strip version from binary name. - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop substituteInPlace $out/share/applications/marktext.desktop \ --replace "Exec=AppRun" "Exec=${pname} --" diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index 42cd8067fe326..f01ef56e5d02c 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -2,21 +2,19 @@ let pname = "neo4j-desktop"; version = "1.5.8"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; + url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${pname}-${version}-x86_64.AppImage"; hash = "sha256-RqzR4TuvDasbkj/wKvOOS7r46sXDxvw3B5ydFGZeHX8="; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $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/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 4606ee9432787..45416035f7b34 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -5,15 +5,13 @@ let version = "1.8.4"; sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; - name = "${pname}-${version}"; - src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; inherit sha256; }; appimageContents = appimageTools.extract { - inherit name src; + inherit pname version src; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +27,6 @@ appimageTools.wrapType2 rec { multiArch = false; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ $out/share/icons/hicolor/1024x1024/apps/notable.png diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 62788b5a7f13f..48f3e6e9cce8f 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -51,7 +51,6 @@ let multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps substituteInPlace $out/share/applications/notesnook.desktop \ diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index 24cc1f5438ec5..3a32e36ca8967 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -12,7 +12,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} mkdir -p $out/share/{applications,pixmaps} cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 585f7443ec476..d9028d8876db1 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -40,7 +40,7 @@ in installPhase = '' runHook preInstall - install -Dm755 ${appexec}/bin/remnote-${version} $out/bin/remnote + install -Dm755 ${appexec}/bin/remnote $out/bin/remnote install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications/ install -Dm444 ${icon} $out/share/pixmaps/remnote.png diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index 351df8c558ad2..c4fef60cff0c6 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -28,7 +28,6 @@ in appimageTools.wrapAppImage { extraInstallCommands = '' # Add desktop convencience stuff - mv $out/bin/{${pname}-*,${pname}} install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps substituteInPlace $out/share/applications/todoist.desktop \ diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 0b26d57e7c4e9..da45da749e2c6 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -10,22 +10,20 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; inherit hash; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; multiArch = false; # no 32bit needed extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png substituteInPlace $out/share/applications/Zettlr.desktop \ diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index b7eca10fc7cfd..41ff2de95ceee 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -6,7 +6,7 @@ let in appimageTools.wrapType2 rec { - name = "${pname}-${version}"; + inherit pname version; src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; @@ -19,7 +19,6 @@ appimageTools.wrapType2 rec { multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { description = "Sylk WebRTC client"; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index d0a1e359f9567..ee28dcbabafc2 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -20,7 +20,6 @@ in appimageTools.wrapType2 { extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/pkgs/applications/networking/cluster/openlens/default.nix b/pkgs/applications/networking/cluster/openlens/default.nix index cc6bc6dc0a193..ef6dfea2d6675 100644 --- a/pkgs/applications/networking/cluster/openlens/default.nix +++ b/pkgs/applications/networking/cluster/openlens/default.nix @@ -19,8 +19,6 @@ appimageTools.wrapType2 { unshareIpc = false; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/open-lens.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/open-lens.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 53d401f01e18e..526b7666db0eb 100644 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ b/pkgs/applications/networking/cozy-drive/default.nix @@ -6,19 +6,17 @@ let pname = "cozydrive"; version = "3.38.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; sha256 = "3liOzZVOjtV1cGrKlOKiFRRqnt8KHPr5Ye5HU0e/BYo="; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/cozydrive.desktop -t $out/share/applications substituteInPlace $out/share/applications/cozydrive.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix index 362771511cf5f..7be8375cecc7c 100644 --- a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix +++ b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix @@ -14,8 +14,6 @@ in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/{locales,resources} $out/share/${pname} install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications 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 diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix index 9f1ff10081779..47cd45bfdd5b1 100644 --- a/pkgs/applications/networking/irc/irccloud/default.nix +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -3,7 +3,6 @@ let pname = "irccloud"; version = "0.16.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; @@ -11,16 +10,15 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: with pkgs; [ at-spi2-core ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \ $out/share/icons/hicolor/512x512/apps/irccloud.png diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index da26d45b2b41d..acb7ebfbe61e4 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -3,19 +3,17 @@ let pname = "electron-mail"; version = "5.1.8"; - name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; sha256 = "sha256-btqlxFrQUyb728i99IE65A9jwEFNvJ5b6zji0kwwATU="; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $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/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 7e0430c1cd82c..29a892942018d 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -17,8 +17,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let appimageContents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -Dm 444 ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications install -Dm 444 ${appimageContents}/tutanota-desktop.png -t $out/share/pixmaps diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 46970cbef1187..811a0d747fa76 100644 --- a/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -14,8 +14,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/locales $out/share/${pname} cp -a ${appimageContents}/resources $out/share/${pname} diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 43392ae28e483..9712de8fbe4a3 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -3,7 +3,6 @@ let pname = "station"; version = "1.52.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage"; @@ -11,10 +10,10 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; profile = '' export LC_ALL=C.UTF-8 @@ -23,7 +22,6 @@ in appimageTools.wrapType2 rec { multiArch = false; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \ $out/share/icons/hicolor/512x512/apps/browserx.png diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 03eee188ac565..c8ea46d0978e6 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -23,7 +23,7 @@ in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/$name $out/bin/${executableName} + mv $out/bin/$pname $out/bin/${executableName} install -m 444 -D ${appimageContents}/${executableName}.desktop $out/share/applications/${executableName}.desktop ${imagemagick}/bin/convert ${appimageContents}/${executableName}.png -resize 512x512 ${pname}_512.png install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${executableName}.png diff --git a/pkgs/applications/office/notion-app-enhanced/default.nix b/pkgs/applications/office/notion-app-enhanced/default.nix index e9206f9e51532..61dd21920ae1d 100644 --- a/pkgs/applications/office/notion-app-enhanced/default.nix +++ b/pkgs/applications/office/notion-app-enhanced/default.nix @@ -2,20 +2,17 @@ let pname = "notion-app-enhanced"; version = "2.0.18-1"; - name = "${pname}-v${version}"; src = fetchurl { url = "https://github.com/notion-enhancer/notion-repackaged/releases/download/v${version}/Notion-Enhanced-${version}.AppImage"; sha256 = "sha256-SqeMnoMzxxaViJ3NPccj3kyMc1xvXWULM6hQIDZySWY="; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $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/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index c70f3aa52c407..730a9d81b2f55 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, appimageTools, desktop-file-utils, fetchurl }: let + pname = "p3x-onenote"; version = "2023.4.117"; - name = "p3x-onenote-${version}"; plat = { aarch64-linux = "-arm64"; @@ -22,18 +22,17 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' mkdir -p $out/share/pixmaps $out/share/licenses/p3x-onenote cp ${appimageContents}/p3x-onenote.png $out/share/pixmaps/ cp ${appimageContents}/p3x-onenote.desktop $out cp ${appimageContents}/LICENSE.electron.txt $out/share/licenses/p3x-onenote/LICENSE - mv $out/bin/${name} $out/bin/p3x-onenote ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value $out/bin/p3x-onenote \ diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index ef6c931bcc6a6..59af6868b7dfe 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -24,7 +24,6 @@ in appimageTools.wrapType2 rec { ]; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png substituteInPlace $out/share/applications/timeular.desktop \ diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index 98f00f2ed54c9..73b896ff0cc52 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -34,7 +34,6 @@ in appimageTools.wrapType2 rec { multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} mkdir "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/" ''; diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 15694ae3e6385..c4c8966aa50d5 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -19,9 +19,7 @@ appimageTools.wrapType2 { unshareIpc = false; extraInstallCommands = '' - mkdir -p $out/bin - mv $out/bin/jbrowse-${version} $out/bin/jbrowse-desktop - + mv $out/bin/jbrowse $out/bin/jbrowse-desktop install -m 444 -D ${appimageContents}/jbrowse-desktop.desktop $out/share/applications/jbrowse-desktop.desktop install -m 444 -D ${appimageContents}/jbrowse-desktop.png \ $out/share/icons/hicolor/512x512/apps/jbrowse-desktop.png diff --git a/pkgs/applications/version-management/radicle-upstream/default.nix b/pkgs/applications/version-management/radicle-upstream/default.nix index 69c960ed78e86..ff12f008f4b27 100644 --- a/pkgs/applications/version-management/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/radicle-upstream/default.nix @@ -1,9 +1,8 @@ -{ lib, stdenv, appimageTools, autoPatchelfHook, zlib, fetchurl, undmg }: +{ lib, stdenv, appimageTools, autoPatchelfHook, zlib, fetchurl, undmg, libgcc }: let pname = "radicle-upstream"; version = "0.3.0"; - name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { @@ -17,7 +16,7 @@ let }; src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - contents = appimageTools.extract { inherit name src; }; + contents = appimageTools.extract { inherit pname version src; }; git-remote-rad = stdenv.mkDerivation rec { pname = "git-remote-rad"; @@ -25,11 +24,11 @@ let src = contents; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ zlib ]; + buildInputs = [ libgcc zlib ]; installPhase = '' mkdir -p $out/bin/ - cp ${contents}/resources/git-remote-rad $out/bin/git-remote-rad + install -Dm755 ${contents}/resources/git-remote-rad $out/bin/git-remote-rad ''; }; @@ -37,11 +36,9 @@ let # v0.1.0) uses unstable rust features, making a from source build impossible at # this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674 linux = appimageTools.wrapType2 { - inherit name src meta; + inherit pname version src meta; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - # this automatically adds the git-remote-rad binary to the users `PATH` so # they don't need to mess around with shell profiles... ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix index 270d5543c9939..cc26adc24780a 100644 --- a/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/pkgs/applications/video/electronplayer/electronplayer.nix @@ -2,21 +2,18 @@ let pname = "electronplayer"; version = "2.0.8"; - name = "${pname}-${version}"; #TODO: remove the -rc4 from the tag in the url when possible src = fetchurl { - url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${name}.AppImage"; + url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${pname}-${version}.AppImage"; sha256 = "wAsmSFdbRPnYnDyWQSbtyj+GLJLN7ibksUE7cegfkhI="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=ElectronPlayer' diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index b7c03850c951c..c3eb942fed929 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -1,14 +1,12 @@ { lib, fetchurl, appimageTools}: -let +appimageTools.wrapAppImage rec { pname = "lbry-desktop"; version = "0.53.9"; -in appimageTools.wrapAppImage rec { - name = "${pname}-${version}"; # Fetch from GitHub Releases and extract src = appimageTools.extract { - inherit name; + inherit pname version; src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml @@ -24,7 +22,7 @@ in appimageTools.wrapAppImage rec { # General fixup extraInstallCommands = '' # Firstly, rename the executable to lbry for convinence - mv $out/bin/${name} $out/bin/lbry + mv $out/bin/${pname} $out/bin/lbry # Now, install assets such as the desktop file and icons install -m 444 -D ${src}/lbry.desktop -t $out/share/applications diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index d75adb88f359c..776950d51ecc1 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -32,7 +32,6 @@ in extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},losslesscut} ( mkdir -p $out/share cd ${extracted}/usr diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/applications/video/molotov/default.nix index 1930f06ffdb60..58e66c8f77ae8 100644 --- a/pkgs/applications/video/molotov/default.nix +++ b/pkgs/applications/video/molotov/default.nix @@ -12,7 +12,6 @@ in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D \ ${appimageContents}/@molotovdesktop-wrapper.desktop \ $out/share/applications/${pname}.desktop diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index 803f352ae4e6f..31a96a5d84220 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -16,8 +16,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/alvr-${version} $out/bin/alvr - install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications substituteInPlace $out/share/applications/alvr.desktop \ --replace 'Exec=alvr_dashboard' 'Exec=alvr' diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index 284f3de28a495..68e873fc28652 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -18,8 +18,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} - install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ ''; diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index ed40f58697cbb..f1ce5135c2aeb 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -30,7 +30,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${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}}" diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 9c930f0afc6cb..13dacc99a4135 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -19,7 +19,6 @@ in appimageTools.wrapType2 { extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/caido.png \ $out/share/icons/hicolor/512x512/apps/caido.png diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index ab4b5b5f3f8f1..dcd469b49681f 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -22,8 +22,6 @@ in appimageTools.wrapType2 rec { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - install -m 444 \ -D ${appimageContents}/usr/lib/chrysalis/resources/static/udev/60-kaleidoscope.rules \ -t $out/lib/udev/rules.d diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index 5af67f9177b44..4e06e08231dbf 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -17,8 +17,6 @@ in appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/HiFile.desktop $out/share/applications/HiFile.desktop install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png substituteInPlace $out/share/applications/HiFile.desktop \ diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index e7d1dbdc274b7..a1bc84dcf5ae3 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -63,8 +63,6 @@ else appimageTools.wrapType2 { appimageContents = appimageTools.extractType2 { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - # Install .desktop files install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps diff --git a/pkgs/by-name/im/immersed-vr/linux.nix b/pkgs/by-name/im/immersed-vr/linux.nix index fa4332e9146c8..cab32531fd7f3 100644 --- a/pkgs/by-name/im/immersed-vr/linux.nix +++ b/pkgs/by-name/im/immersed-vr/linux.nix @@ -7,8 +7,4 @@ appimageTools.wrapType2 rec { inherit pname version src meta; name = "${pname}-${version}"; - - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - ''; } diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 49b6f245f76f2..c539c48623b70 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -17,7 +17,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/jan-${version} $out/bin/jan install -Dm444 ${appimageContents}/jan.desktop -t $out/share/applications substituteInPlace $out/share/applications/jan.desktop \ --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=jan' diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 6019ffed2b89b..f996385268607 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { runHook preInstall install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg - makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} \ + makeWrapper ${appimage}/bin/${pname} $out/bin/${pname} \ --append-flags "--update-failed" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [icu]} diff --git a/pkgs/by-name/kc/kchat/package.nix b/pkgs/by-name/kc/kchat/package.nix index bb806d5aa0a37..1eaf7650b6a18 100644 --- a/pkgs/by-name/kc/kchat/package.nix +++ b/pkgs/by-name/kc/kchat/package.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { cp -r ${contents}/{locales,resources} "$out/share/lib/kchat" cp -r ${contents}/usr/* "$out" cp "${contents}/kchat-desktop.desktop" "$out/share/applications/" - mv "$out/bin/kchat-${version}" "$out/bin/${meta.mainProgram}" + mv "$out/bin/kchat" "$out/bin/${meta.mainProgram}" || true substituteInPlace $out/share/applications/kchat-desktop.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}' ''; diff --git a/pkgs/by-name/km/kmeet/package.nix b/pkgs/by-name/km/kmeet/package.nix index 8c928e434123b..287a74616302f 100644 --- a/pkgs/by-name/km/kmeet/package.nix +++ b/pkgs/by-name/km/kmeet/package.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { cp -r ${contents}/{locales,resources} "$out/share/lib/kmeet" cp -r ${contents}/usr/* "$out" cp "${contents}/kMeet.desktop" "$out/share/applications/" - mv "$out/bin/kmeet-${version}" "$out/bin/${meta.mainProgram}" + mv "$out/bin/kmeet" "$out/bin/${meta.mainProgram}" || true substituteInPlace $out/share/applications/kMeet.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}' ''; diff --git a/pkgs/by-name/li/listen1/package.nix b/pkgs/by-name/li/listen1/package.nix index cf0ec27d6923e..97470e33c77f2 100644 --- a/pkgs/by-name/li/listen1/package.nix +++ b/pkgs/by-name/li/listen1/package.nix @@ -13,7 +13,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/listen1.desktop -t $out/share/applications substituteInPlace $out/share/applications/listen1.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index f1edf4d8c5e0d..e8bfd547ab5a9 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -20,7 +20,6 @@ appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications - mv $out/bin/lmstudio-${version} $out/bin/lmstudio cp -r ${appimageContents}/usr/share/icons $out/share install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications substituteInPlace $out/share/applications/lm-studio.desktop \ diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index b675a0295b0aa..61157c3c29f3c 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -16,7 +16,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/{lunar-client-*,lunar-client} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/lunar-client \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index 45e747ad9771c..75a60aabfde94 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -23,7 +23,6 @@ appimageTools.wrapType2 rec { cp -r ${contents}/{locales,resources} "$out/share/lib/miru" cp -r ${contents}/usr/* "$out" cp "${contents}/${pname}.desktop" "$out/share/applications/" - mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index f2c22d54ade8a..6ec192a6ab14e 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -34,7 +34,6 @@ appimageTools.wrapType2 { extraPkgs = pkgs: [ ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index 1b96328b211b4..c3efc29b55c09 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -68,9 +68,6 @@ if stdenv.isDarwin then stdenv.mkDerivation { inherit pname version src; }; in '' - # Replace version from binary name - mv $out/bin/${pname}-${version} $out/bin/${pname} - # Install XDG Desktop file and its icon install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix index 4f3aaea95f24e..0b54203008140 100644 --- a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix +++ b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix @@ -164,7 +164,7 @@ in # Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. # Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them buildFHSEnv { - name = derivation.name; + inherit (derivation) pname version; targetPkgs = pkgs': [ curl @@ -175,7 +175,6 @@ buildFHSEnv { runScript = "/bin/onlyoffice-desktopeditors"; extraInstallCommands = '' - mv $out/bin/$name $out/bin/onlyoffice-desktopeditors mkdir -p $out/share ln -s ${derivation}/share/icons $out/share cp -r ${derivation}/share/applications $out/share diff --git a/pkgs/by-name/pa/parsify/package.nix b/pkgs/by-name/pa/parsify/package.nix index b02c6c3ae0a41..b5c122717289d 100644 --- a/pkgs/by-name/pa/parsify/package.nix +++ b/pkgs/by-name/pa/parsify/package.nix @@ -15,8 +15,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${contents}/@parsifydesktop.desktop -t $out/share/applications substituteInPlace $out/share/applications/@parsifydesktop.desktop \ diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 1868e2669cdb5..ad15cd9cb1ee6 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -28,8 +28,6 @@ in appimageTools.wrapType2 { ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install --mode=444 -D ${appimageContents}/chat.simplex.app.desktop --target-directory=$out/share/applications substituteInPlace $out/share/applications/chat.simplex.app.desktop \ --replace 'Exec=simplex' 'Exec=${pname}' diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index f6b9372709e99..f73243de0310f 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -65,9 +65,6 @@ else appimageTools.wrapType2 { appimageContents = appimageTools.extractType2 { inherit pname version src; }; in '' - # Remove version from entrypoint - mv $out/bin/spacedrive-${version} $out/bin/spacedrive - # Install .desktop files install -Dm444 ${appimageContents}/com.spacedrive.desktop -t $out/share/applications install -Dm444 ${appimageContents}/spacedrive.png -t $out/share/pixmaps diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 3be3625cd696e..0f6cdeffe86ca 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -15,8 +15,6 @@ appimageTools.wrapType2 { inherit src pname version; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $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}}" diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index fc14b131be8a9..87ef45ba981bb 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -25,7 +25,6 @@ appimageTools.wrapType2 { extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix index 757b9e8c206c8..14675efdac179 100644 --- a/pkgs/development/web/bootstrap-studio/default.nix +++ b/pkgs/development/web/bootstrap-studio/default.nix @@ -13,8 +13,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/bstudio.desktop -t $out/share/applications substituteInPlace $out/share/applications/bstudio.desktop \ diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index e98627874245b..945fe4ac91b3f 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -64,7 +64,7 @@ else appimageTools.wrapType2 { contents = appimageTools.extract { inherit pname version src; }; in '' - mv -v $out/bin/${pname}-${version} $out/bin/osu\! + mv -v $out/bin/${pname} $out/bin/osu\! install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications for i in 16 32 48 64 96 128 256 512 1024; do install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png diff --git a/pkgs/tools/misc/betterdiscord-installer/default.nix b/pkgs/tools/misc/betterdiscord-installer/default.nix index f064f5227bf9f..bb2d88a64e605 100644 --- a/pkgs/tools/misc/betterdiscord-installer/default.nix +++ b/pkgs/tools/misc/betterdiscord-installer/default.nix @@ -2,20 +2,17 @@ let pname = "betterdiscord-installer"; version = "1.0.0-beta"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/BetterDiscord/Installer/releases/download/v${version}/Betterdiscord-Linux.AppImage"; sha256 = "103acb11qmvjmf6g9lgsfm5jyahfwfdqw0x9w6lmv1hzwbs26dsr"; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications substituteInPlace $out/share/applications/betterdiscord.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 6712925d01206..a9eb3c2482587 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -35,7 +35,6 @@ in appimageTools.wrapAppImage { extraInstallCommands = '' # Add desktop convencience stuff - mv $out/bin/{${pname}-*,${pname}} install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop \ diff --git a/pkgs/tools/misc/mathpix-snipping-tool/default.nix b/pkgs/tools/misc/mathpix-snipping-tool/default.nix index 2a3e45dd6367b..0f03913c87a84 100644 --- a/pkgs/tools/misc/mathpix-snipping-tool/default.nix +++ b/pkgs/tools/misc/mathpix-snipping-tool/default.nix @@ -2,20 +2,17 @@ let pname = "mathpix-snipping-tool"; version = "03.00.0072"; - name = "${pname}-${version}"; src = fetchurl { url = "https://download.mathpix.com/linux/Mathpix_Snipping_Tool-x86_64.v${version}.AppImage"; sha256 = "1igg8wnshmg9f23qqw1gqb85h1aa3461c1n7dmgw6sn4lrrrh5ms"; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 47f3df7743780..ffcd456e75fff 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -3,16 +3,15 @@ let pname = "via"; version = "3.0.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; sha256 = "sha256-+uTvmrqHK7L5VA/lUHCZZeRYPUrcVA+vjG7venxuHhs="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; profile = '' # Skip prompt to add udev rule. @@ -21,7 +20,6 @@ appimageTools.wrapType2 { ''; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/via-nativia.desktop -t $out/share/applications substituteInPlace $out/share/applications/via-nativia.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index e4c2b2989394c..d33a6053d5744 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,6 +1,5 @@ { lib, fetchurl, appimageTools }: let - name = "vial-${version}"; version = "0.7.1"; pname = "Vial"; @@ -9,13 +8,12 @@ let hash = "sha256-pOcrxZ6vbnbdE/H4Kxufxm/ZovaYBXjFpVpKZYV7f3c="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index eaa910def691d..803ad53038e7a 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -26,7 +26,6 @@ appimageTools.wrapType2 rec { wooting-udev-rules xorg.libxkbfile ]); - extraInstallCommands = "mv $out/bin/{${pname}-${version},${pname}}"; meta = with lib; { homepage = "https://wooting.io/wootility"; diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/tools/networking/mockoon/default.nix index 0a2670009cced..362d400f48d5d 100644 --- a/pkgs/tools/networking/mockoon/default.nix +++ b/pkgs/tools/networking/mockoon/default.nix @@ -21,8 +21,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share diff --git a/pkgs/tools/networking/motrix/default.nix b/pkgs/tools/networking/motrix/default.nix index 2270034ce5de2..2d0919cb0aceb 100644 --- a/pkgs/tools/networking/motrix/default.nix +++ b/pkgs/tools/networking/motrix/default.nix @@ -19,8 +19,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share diff --git a/pkgs/tools/networking/requestly/default.nix b/pkgs/tools/networking/requestly/default.nix index 20e877563afa9..6f5dec9975594 100644 --- a/pkgs/tools/networking/requestly/default.nix +++ b/pkgs/tools/networking/requestly/default.nix @@ -18,8 +18,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share ''; diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 3926a3ee81c3b..0ee20dbc4f6b6 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -15,7 +15,6 @@ in appimageTools.wrapType2 { extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications substituteInPlace $out/share/applications/buttercup.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' |