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/audio | |
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/audio')
-rw-r--r-- | pkgs/applications/audio/cider/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/museeks/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/nuclear/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/plexamp/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/audio/sonixd/default.nix | 3 |
5 files changed, 0 insertions, 12 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"; }; } - |