From 985aa8174d940615c6966fd66b3cbf585e5697d4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 21 Apr 2024 16:31:47 +0200 Subject: 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 --- pkgs/development/web/bloomrpc/default.nix | 1 - pkgs/development/web/bootstrap-studio/default.nix | 2 -- 2 files changed, 3 deletions(-) (limited to 'pkgs/development/web') 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 \ -- cgit 1.4.1