Unverified Commit 9906233d authored by éclairevoyant's avatar éclairevoyant Committed by GitHub
Browse files

Merge pull request #278164 from amarshall/resolve-desktop-file 

davinci-resolve: fix desktop item, fix mainProgram for studio variant
parents 80e25971 5ff3569d

pkgs/applications/video/davinci-resolve/default.nix

+11 −5
Original line number Diff line number Diff line
@@ -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"}";

  };

}