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 --- .../networking/instant-messengers/caprine-bin/build-from-appimage.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/applications/networking/instant-messengers/caprine-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 -- cgit 1.4.1