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

[Backport release-23.11] davinci-resolve: 18.5.1 -> 18.6.2; add studio variant; various improvements #273578

Merged
merged 9 commits into from
Dec 17, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Bot-based backport to release-23.11, triggered by a label in #255577.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

Without libXt, shows popup on launch:

> Unable to load plugin: USD.plugin
>
> libXt.so.6: cannot open shared object file: No such file or directory

ultimately launches okay without it, but some feature would probably be
broken.

(cherry picked from commit b8698e3)
Otherwise getting it is…non-trivial.

(cherry picked from commit 8e2b31f)
`appimage-run` fails silently if the file does not exist. This made it
easy to have mismatches that lead to non-obvious build errors.

(cherry picked from commit 7b93c20)
Resolve wants to write the license to `./.license` in the drv store
path. This obviously fails as it is read-only. Conveniently this is a
Bubblewrap-based FHS env, so we can bind-mount a reasonable dir from
$HOME to this path instead. Unfortunately, the dir needs to exist before
launching, so it must be manually created presently e.g.

    mkdir -p ~/.local/share/DaVinciResolve/license

At least the error is fairly obvious:

> bwrap: Can't find source path /home/user/.local/share/DaVinciResolve/license: No such file or directory

Without making the license writable, license activation will always give
a generic error—the actual problem was found with strace.

(cherry picked from commit fe45cd3)
The downloads.json also includes metadata for older versions, so this
should be durable unless upstream breaks things. Some older downloads
appear to not include the “Update” suffix in the name, so match with or
without it.

(cherry picked from commit 5cfab80)
(cherry picked from commit b01f295)
(cherry picked from commit 304b1bd)
See #265476

This is a hack that effectively undoes
#263201 for just this derivation.
Really we should probably be doing a ton of autoPatchelf or something to
patch in our libs. Alas, this is “good enough” to un-break for now, I
think.

(cherry picked from commit f1361c5)
@pbsds
Copy link
Contributor

pbsds commented Dec 17, 2023

Result of nixpkgs-review pr 273578 run on x86_64-linux 1

2 packages built:
  • davinci-resolve
  • davinci-resolve-studio

@pbsds pbsds merged commit 1e2e384 into release-23.11 Dec 17, 2023
23 checks passed
@emilylange emilylange deleted the backport-255577-to-release-23.11 branch December 20, 2023 20:39
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.

None yet

4 participants