nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-24.05] davinci-resolve: fix desktop item, fix mainProgram for studio variant (#342620)

Browse Source
This commit is contained in:
Winter 2024-09-17 18:18:44 -04:00 committed by GitHub
commit 600c5035b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/video/davinci-resolve/default.nix
View File

@ -165,11 +165,11 @@ let
desktopItems = [
(makeDesktopItem {
name = "davinci-resolve";
desktopName = "Davinci Resolve";
name = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
desktopName = "Davinci Resolve${lib.optionalString studioVariant " Studio"}";
genericName = "Video Editor";
exec = "resolve";
# icon = "DV_Resolve";
exec = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
icon = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
comment = "Professional video editing, color, effects and audio post-processing";
categories = [
"AudioVideo"
@ -254,6 +254,12 @@ buildFHSEnv {
''
}";
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps
ln -s ${davinci}/share/applications/*.desktop $out/share/applications/
ln -s ${davinci}/graphics/DV_Resolve.png $out/share/icons/hicolor/128x128/apps/davinci-resolve${lib.optionalString studioVariant "-studio"}.png
'';
passthru = {
inherit davinci;
updateScript = lib.getExe (writeShellApplication {
@ -284,6 +290,6 @@ buildFHSEnv {
maintainers = with maintainers; [ amarshall jshcmpbll orivej ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
mainProgram = "davinci-resolve";
mainProgram = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
};
}