Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

davinci-resolve: propagate desktop file & set mainProgram for studio version #309514

Closed
wants to merge 2 commits into from

Conversation

Naxdy
Copy link
Contributor

@Naxdy Naxdy commented May 6, 2024

Description of changes

  • propagate .desktop file and icons for both regular and studio variants (studio variant has its icon renamed to avoid clashing with the regular variant)
  • set mainProgram to be equal to davinci.pname which buildFHSEnv uses as the basis for the executable name

fixes #278133

Closes #278164

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Naxdy Naxdy force-pushed the work/fix-davinci-desktop-file branch from 7f13817 to f26c60b Compare May 6, 2024 09:18
Copy link
Contributor

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please drop the first commit, we don't use nixpkgs-fmt in nixpkgs.
Also, isn't there some overlap with #278164? (Though maybe that doesn't matter since there's not much activity on the other PR)

@Naxdy
Copy link
Contributor Author

Naxdy commented May 6, 2024

Please drop the first commit, we don't use nixpkgs-fmt in nixpkgs. Also, isn't there some overlap with #278164? (Though maybe that doesn't matter since there's not much activity on the other PR)

Yeah, it's basically the same thing, but the other PR seems abandoned :(

Will drop the fmt commit

@Naxdy Naxdy force-pushed the work/fix-davinci-desktop-file branch 2 times, most recently from afe2c9c to d33c0ef Compare May 6, 2024 10:36
@Naxdy Naxdy requested a review from eclairevoyant May 6, 2024 10:39
@Naxdy Naxdy force-pushed the work/fix-davinci-desktop-file branch from d33c0ef to dc7c763 Compare May 6, 2024 10:40
@Naxdy Naxdy force-pushed the work/fix-davinci-desktop-file branch from dc7c763 to 1f2178f Compare May 26, 2024 10:07
@Naxdy Naxdy added the backport release-24.05 Backport PR automatically label May 26, 2024
@w-lfchen
Copy link
Member

#278164 has been merged
if i'm not mistaken, this pr can be closed now but i'm not 100% sure

@Naxdy
Copy link
Contributor Author

Naxdy commented Jun 15, 2024

yep, looks good!

@Naxdy Naxdy closed this Jun 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DaVinci Resolve Studio is missing .desktop entry for application launchers
5 participants