From d1bbb2b3d6997bb741770071f6886931a0e888d6 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 9 Mar 2022 22:49:06 +0100 Subject: [PATCH] copyDesktopItems: Use bin output Desktop files are only useful when accompanied by the binaries they specify. So it makes more sense to put them next to the binaries rather than `$out` which only usually contains the binaries. --- pkgs/build-support/setup-hooks/copy-desktop-items.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh index b5c5ed81eb97..6fa1dc50eb89 100644 --- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh +++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh @@ -30,12 +30,14 @@ copyDesktopItems() { for desktopItem in $desktopItems; do if [[ -f "$desktopItem" ]]; then - echo "Copying '$desktopItem' into '$out/share/applications'" - install -D -m 444 -t "$out"/share/applications "$desktopItem" + echo \ + "Copying '$desktopItem' into '${!outputBin}/share/applications'" + install -D -m 444 -t "${!outputBin}"/share/applications \ + "$desktopItem" else for f in "$desktopItem"/share/applications/*.desktop; do - echo "Copying '$f' into '$out/share/applications'" - install -D -m 444 -t "$out"/share/applications "$f" + echo "Copying '$f' into '${!outputBin}/share/applications'" + install -D -m 444 -t "${!outputBin}"/share/applications "$f" done fi done