diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-17 06:01:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-17 06:01:28 +0000 |
commit | f8cf67790e37ea0e5dd1d84755d89f45417fcff8 (patch) | |
tree | 4374cc0b47c7793c9b31f240ee21510691cd4bfe /pkgs/build-support/setup-hooks | |
parent | 485e62c1840ba0b3d96774c100ee4df311a1a71e (diff) | |
parent | 2e7f48aabfa54fe37510a7922cfba14e3d600c83 (diff) | |
download | nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.gz nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.bz2 nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.lz nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.xz nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.zst nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r-- | pkgs/build-support/setup-hooks/copy-desktop-items.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh index f96a10f33d5..b5c5ed81eb9 100644 --- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh +++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh @@ -30,8 +30,8 @@ copyDesktopItems() { for desktopItem in $desktopItems; do if [[ -f "$desktopItem" ]]; then - echo "Copying '$f' into '$out/share/applications'" - install -D -m 444 -t "$out"/share/applications "$f" + echo "Copying '$desktopItem' into '$out/share/applications'" + install -D -m 444 -t "$out"/share/applications "$desktopItem" else for f in "$desktopItem"/share/applications/*.desktop; do echo "Copying '$f' into '$out/share/applications'" |