Skip to content

variety: install missing desktop file - #486304

Merged
pbsds merged 2 commits into
NixOS:masterfrom
willfish:variety-fix-desktop-file
Feb 2, 2026
Merged

variety: install missing desktop file#486304
pbsds merged 2 commits into
NixOS:masterfrom
willfish:variety-fix-desktop-file

Conversation

@willfish

@willfish willfish commented Feb 2, 2026

Copy link
Copy Markdown
Contributor

The 0.9.0-b1 update (#477721) moved variety from DistUtilsExtra.auto to plain setuptools + setuptools-gettext. The old build system automatically processed and installed variety.desktop.in to share/applications/, but the new setup.py only installs variety.appdata.xml via data_files — the desktop file was dropped.

This adds a postInstall step that uses intltool-merge (already in nativeBuildInputs) to process variety.desktop.in and install the resulting variety.desktop to $out/share/applications/.

Fixes the issue reported by @linsui in #477721 (comment).

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.
@willfish willfish mentioned this pull request Feb 2, 2026
13 tasks
@nixpkgs-ci
nixpkgs-ci Bot requested a review from zfnmxt February 2, 2026 15:13
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Feb 2, 2026
@linsui

linsui commented Feb 2, 2026

Copy link
Copy Markdown
Contributor

The icon also needs to be installed.

@willfish

willfish commented Feb 2, 2026

Copy link
Copy Markdown
Contributor Author

Good catch, thanks. I've added the scalable SVG icon installation in 006b8ea. The output now has both files:

$out/share/applications/variety.desktop
$out/share/icons/hicolor/scalable/apps/variety.svg
@willfish

willfish commented Feb 2, 2026

Copy link
Copy Markdown
Contributor Author

Confirmed working locally
Screenshot_2026-02-02_17-54-10

@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 2, 2026
@pbsbot

pbsbot commented Feb 2, 2026

Copy link
Copy Markdown

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 486304
Commit: 006b8ea7accb818a0bc21bf238dc2f54abc589f8


x86_64-linux

✅ 2 packages built:
  • variety
  • variety.dist
@pbsds
pbsds added this pull request to the merge queue Feb 2, 2026
Merged via the queue into NixOS:master with commit c40c1d4 Feb 2, 2026
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

4 participants