Commit 985aa817 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt
Browse files

treewide: unbreak appimageTools.wrapType2 builds 

`appimageTools.wrapType2` no longer creates a binary `$out/bin/${name}` if `pname` and `version` is provided.
Derivations that have worked around this behavior with a `mv $out/bin/{${name},${pname}}` broke as a result.
This should fix most instances.

contex: #271071
parent 9a1ba358

pkgs/applications/audio/cider/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -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}}"

pkgs/applications/audio/museeks/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -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/

pkgs/applications/audio/nuclear/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -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; {

pkgs/applications/audio/plexamp/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/audio/sonixd/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -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";

  };

}