Commit Graph

9 Commits

Author SHA1 Message Date
Gliczy
72a2c77772 makeAutostartItem: only use sed on Exec key
Fix cases when using `makeStartupItem` and it's `prependExtraArgs` or
`appendExtraArgs` option with a desktop file having a `TryExec` key.

The `TryExec` key must either be an absolute path to the binary or the
binary name (if present in $PATH). When using either of the two options
above, the `TryExec` key will be modified to have the flags as it's
content, which is invalid and will break the desktop file.

The change to the sed command makes it so only lines starting with
`Exec` are changed, ignoring `TryExec` and preventing the issue from
happening.

Link to the FDO specification:
https://specifications.freedesktop.org/desktop-entry/latest/recognized-keys.html
2026-06-14 04:11:53 +02:00
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Felix Schröter
498d662662 make-startupitem: fix {prepend,append}ExtraArgs for Exec without arguments 2024-08-18 12:28:06 +02:00
Felix Schröter
c9de424f87 make-startupitem: add prependExtraArgs and appendExtraArgs 2024-05-30 22:27:15 +02:00
Anton Mosich
04df8d6442 make-startupitem: fix typo in comment 2023-08-16 18:03:02 +02:00
Bastian Köcher
6bf72482eb make-autostartitem: Use the right path for storing the desktop files
The freedesktop specification says that the autostart folder is located at $XDG_CONFIG_DIRS/autostart.
Nixos defines XDG_CONFIG_DIRS as /etc/xdg. So we need to copy the desktop files into the right folder
with make-startupitem.
2017-07-06 00:44:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Arie Middelkoop
d4960f72be Added an optional parameter to "make-startupitem" to provide a prefix to the ".desktop" file.
svn path=/nixpkgs/trunk/; revision=32686
2012-02-29 12:50:17 +00:00
Arie Middelkoop
acda2c1967 Makes a .desktop startup item from a .desktop menu entry.
svn path=/nixpkgs/trunk/; revision=31958
2012-02-01 22:06:49 +00:00