diff options
Diffstat (limited to 'pkgs/by-name')
22 files changed, 4 insertions, 37 deletions
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 |